diff --git a/run_flaschengeist b/run_flaschengeist
index 41f9494..6a89775 100644
--- a/run_flaschengeist
+++ b/run_flaschengeist
@@ -1,10 +1,18 @@
 #!/usr/bin/python3
 from flaschengeist import create_app
+import bjoern
+import argparse
 
-""" Main
-    
-    Start the backend
-"""
 
 if __name__ == '__main__':
-    create_app().run(debug=True, host='0.0.0.0')
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--host", help="set hostname to listen on", default="127.0.0.1")
+    parser.add_argument("--port", help="set port to listen on", type=int, default=5000)
+    parser.add_argument("--debug", help="run in debug mode", action="store_true")
+    args = parser.parse_args()
+
+    app = create_app()
+    if args.debug:
+        app.run(args.host, args.port, debug=True)
+    else:
+        bjoern.run(app, args.host, args.port, reuse_port=True)
diff --git a/setup.py b/setup.py
index 4720a1c..64094f9 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
     package_data={'': ['*.yml']},
     scripts=['run_flaschengeist'],
     install_requires=['Flask >= 1.1', 'PyYAML>=5.3.1', 'sqlalchemy>=1.3', "flask_sqlalchemy",
-                      "flask_cors", "werkzeug"],
+                      "flask_cors", "werkzeug", "bjoern"],
     extras_require={
         'ldap': [
             'flask_ldapconn',