diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95398f63..da60688e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,7 @@ test-docs:
   <<: *only-default
   image: python:3.11-bullseye
   script:
-  - tox -e docs
+    - tox -e docs
 
 deploy_production:
   stage: deploy
@@ -259,16 +259,7 @@ build-image:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-      --tag $IMAGE_TAG
-      --tag $CURRENT_TAG
-      --tag $MINOR_TAG
-      --tag $MAJOR_TAG
-      --tag $LATEST_TAG
-      --file docker/Dockerfile
-      --platform linux/amd64,linux/arm64
-      --push
-      --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
   rules:
     - if: $CI_COMMIT_TAG
       when: delayed
@@ -288,12 +279,7 @@ build-image-dev:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-      --tag $IMAGE_TAG
-      --file docker/Dockerfile
-      --platform linux/amd64,linux/arm64
-      --push
-      --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -314,12 +300,7 @@ build-image-mr:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-    --tag $IMAGE_TAG
-    --file docker/Dockerfile
-    --platform linux/amd64,linux/arm64
-    --push
-    --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual
diff --git a/allianceauth/bin/allianceauth.py b/allianceauth/bin/allianceauth.py
index ee2f9ea0..20cfb53d 100644
--- a/allianceauth/bin/allianceauth.py
+++ b/allianceauth/bin/allianceauth.py
@@ -12,13 +12,14 @@ class StartProject(BaseStartProject):
         parser.add_argument('--python', help='The path to the python executable.')
         parser.add_argument('--celery', help='The path to the celery executable.')
         parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
+        parser.add_argument('--memmon', help='The path to the memmon executable.')
 
 
 def create_project(parser, options, args):
     # Validate args
     if len(args) < 2:
         parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 3:
+    elif len(args) > 4:
         parser.error("Too many arguments.")
 
     # First find the path to Alliance Auth