diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ffcff80500e0401c90541753dad0a8b20b96d5e..52492ef3b8ab1062c7a1b61911b93a8cef797485 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -519,9 +519,39 @@ clean-images:
   script:
     - bash ./.gitlab/remove-unsupported-images.sh
 
-release-images:
+release-images-amd64:
   stage: release
   image: docker:${DOCKER_VERSION}-dind
+  variables:
+    PLATFORM: linux/amd64
+  dependencies:
+    - clean-images
+    - test-analyse-service
+    - test-auth-service-init
+    - test-data-service
+    - test-python-lib
+    - test-metadata-service
+    - test-search-service
+    - test-ui
+  only:
+    - tags
+    - dev
+    - 522-integrate-the-new-ui
+  before_script:
+    - "apk add --no-cache make"
+    - "docker logout ${CI_REGISTRY_URL}"
+    - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
+    - "docker logout ${CI_REGISTRY2_URL}"
+    - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
+  script:
+    - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
+    - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
+
+release-images-arm64:
+  stage: release
+  image: docker:${DOCKER_VERSION}-dind
+  variables:
+    PLATFORM: linux/arm64
   dependencies:
     - clean-images
     - test-analyse-service
@@ -542,10 +572,8 @@ release-images:
     - "docker logout ${CI_REGISTRY2_URL}"
     - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
   script:
-    - PLATFORM=linux/amd64 REPOSITORY_URL=$CI_REGISTRY_URL make release-images
-    - PLATFORM=linux/amd64 REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
-    - PLATFORM=linux/arm64 REPOSITORY_URL=$CI_REGISTRY_URL make release-images
-    - PLATFORM=linux/arm64 REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
+    - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
+    - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
 
 release-helm:
   stage: release