diff --git a/templates/watcher/config/10-watcher-wsgi-main.conf b/templates/watcher/config/10-watcher-wsgi-main.conf
index 182b48b..7031f1f 100644
--- a/templates/watcher/config/10-watcher-wsgi-main.conf
+++ b/templates/watcher/config/10-watcher-wsgi-main.conf
@@ -33,7 +33,7 @@
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess {{ $endpt }} display-name={{ $endpt }} group=watcher processes=8 threads=1 user=watcher
   WSGIProcessGroup {{ $endpt }}
-  WSGIScriptAlias / "/var/www/cgi-bin/watcher/main"
+  WSGIScriptAlias / "/usr/bin/watcher-api-wsgi"
 </VirtualHost>
 {{ end }}
 {{ end }}
diff --git a/templates/watcher/config/main b/templates/watcher/config/main
deleted file mode 100755
index 3b2e937..0000000
--- a/templates/watcher/config/main
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python3
-#PBR Generated from 'wsgi_scripts'
-
-import threading
-
-from watcher.api.wsgi import initialize_wsgi_app
-
-if __name__ == "__main__":
-    import argparse
-    import socket
-    import sys
-    import wsgiref.simple_server as wss
-
-    parser = argparse.ArgumentParser(
-        description=initialize_wsgi_app.__doc__,
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        usage='%(prog)s [-h] [--port PORT] [--host IP] -- [passed options]')
-    parser.add_argument('--port', '-p', type=int, default=8000,
-                        help='TCP port to listen on')
-    parser.add_argument('--host', '-b', default='',
-                        help='IP to bind the server to')
-    parser.add_argument('args',
-                        nargs=argparse.REMAINDER,
-                        metavar='-- [passed options]',
-                        help="'--' is the separator of the arguments used "
-                        "to start the WSGI server and the arguments passed "
-                        "to the WSGI application.")
-    args = parser.parse_args()
-    if args.args:
-        if args.args[0] == '--':
-            args.args.pop(0)
-        else:
-            parser.error("unrecognized arguments: %s" % ' '.join(args.args))
-    sys.argv[1:] = args.args
-    server = wss.make_server(args.host, args.port, initialize_wsgi_app())
-
-    print("*" * 80)
-    print("STARTING test server watcher.api.wsgi.initialize_wsgi_app")
-    url = "http://%s:%d/" % (server.server_name, server.server_port)
-    print("Available at %s" % url)
-    print("DANGER! For testing only, do not use in production")
-    print("*" * 80)
-    sys.stdout.flush()
-
-    server.serve_forever()
-else:
-    application = None
-    app_lock = threading.Lock()
-
-    with app_lock:
-        if application is None:
-            application = initialize_wsgi_app()