diff --git a/module_build_service/manage.py b/module_build_service/manage.py
index f00a6811..bd4b3cbc 100644
--- a/module_build_service/manage.py
+++ b/module_build_service/manage.py
@@ -303,5 +303,9 @@ def runssl(host=conf.host, port=conf.port, debug=False):
         debug=debug
     )
 
-if __name__ == "__main__":
+
+def manager_wrapper():
     manager.run()
+
+if __name__ == "__main__":
+    manager_wrapper()
diff --git a/setup.py b/setup.py
index 73cf8baa..c1563c30 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ setup(name='module-build-service',
           'console_scripts': ['mbs-daemon = module_build_service.scheduler.main:main',
                               'mbs-upgradedb = module_build_service.manage:upgradedb',
                               'mbs-gencert = module_build_service.manage:generatelocalhostcert',
-                              'mbs-frontend = module_build_service.manage:runssl']
+                              'mbs-frontend = module_build_service.manage:runssl',
+                              'mbs-manager = module_build_service.manage:manager_wrapper']
       },
       data_files=[('/etc/module-build-service/', ['conf/cacert.pem',
                                                   'conf/config.py',