diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f05126d9..829d19ca7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,57 +73,23 @@ build-prod-noauth:
   before_script:
     - export AUTH0_ENABLED=false
 
-deploy-main-amd64:
-  extends:
-    - .build-and-deploy
-  dependencies:
-    - build-prod
-  variables:
-    DOCKERHUB_TAG: 'amd64'
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == "main"'
-
-deploy-main-arm64:
-  extends:
-    - .build-and-deploy
-  dependencies:
-    - build-prod
-  tags:
-    - 'arm64'
-  variables:
-    DOCKERHUB_TAG: 'arm64'
-  rules:
-    - if: $MULTI_ARCH_BUILD || $ARM64_BUILD
-
-deploy-dev-noauth-amd64:
+deploy-dev-noauth:
   extends:
     - .build-and-deploy
   dependencies:
     - build-prod-noauth
   variables:
-    DOCKERHUB_TAG: 'dev-noauth-amd64'
+    DOCKERHUB_TAG: 'dev-noauth'
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == "main"'
 
-deploy-dev-noauth-arm64:
-  extends:
-    - .build-and-deploy
-  dependencies:
-    - build-prod-noauth
-  tags:
-    - 'arm64'
-  variables:
-    DOCKERHUB_TAG: 'dev-noauth-arm64'
-  rules:
-    - if: $MULTI_ARCH_BUILD || $ARM64_BUILD
-
-deploy-merge-request:
+deploy-merge-request-auth:
   extends:
     - .build-and-deploy
   dependencies:
     - build-prod
   variables:
-    DOCKERHUB_TAG: mr-$CI_MERGE_REQUEST_IID
+    DOCKERHUB_TAG: mr-$CI_MERGE_REQUEST_IID-noauth
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
 
@@ -136,37 +102,3 @@ deploy-merge-request-noauth:
     DOCKERHUB_TAG: mr-$CI_MERGE_REQUEST_IID-noauth
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
-
-retag-main-amd64-as-latest:
-  extends: .retag-dockerhub-image
-  rules:
-    - if: $MULTI_ARCH_BUILD || $ARM64_BUILD
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == "main"'
-    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
-  variables:
-    SOURCE_TAG: 'amd64'
-    TARGET_TAG: 'latest'
-  cache:
-
-retag-dev-noauth-amd64:
-  extends: .retag-dockerhub-image
-  rules:
-    - if: $MULTI_ARCH_BUILD || $ARM64_BUILD
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PIPELINE_SOURCE != "schedule" && $CI_COMMIT_BRANCH == "main"'
-    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
-  variables:
-    SOURCE_TAG: 'dev-noauth-amd64'
-    TARGET_TAG: 'dev-noauth'
-  cache:
-
-publish-multi-arch-latest:
-  extends: .retag-as-multi-arch-dockerhub-image
-  cache:
-
-publish-multi-arch-dev-noauth:
-  variables:
-    TAG_PREFIX: 'dev-noauth-'
-  extends: .retag-as-multi-arch-dockerhub-image
-  cache: