diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12a88ed75a377fc624733c286efc43bebae2bf6c..bbb680a8473b10bfebf25668b5bbb65722ad0e9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ variables:
         - apk update
         - apk add git
         - apk add jq
+        - apk add curl
         # Init docker buildx
         - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
         - docker buildx create --use
@@ -46,7 +47,6 @@ variables:
         - !reference [ .init_dind_script, script ]
         - mkdir -p $ARTIFACTS_FOLDER
         # Download secure files
-        - apk add curl
         - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | sh
         - mv .secure_files/env_$VERSION $PROJECT_FOLDER/.env
         # Need to build for each platform separately because of multi-stage builds (docker buildx don't use cache same way as docker build)
@@ -67,8 +67,7 @@ variables:
 
 stages:
     - build
-    - clean-same-release
-    - clean-dev-release
+    - clean
     - release
 
 build:test:
@@ -100,7 +99,7 @@ build:version:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
 
 clean:release:
-    stage: clean-same-release
+    stage: clean
     tags:
         - gitlab_clean
     image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest
@@ -110,8 +109,8 @@ clean:release:
     rules:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^v[0-9]+(\.[0-9]+)*$/'
 
-clean-dev:release:
-    stage: clean-dev-release
+clean:dev:release:
+    stage: clean
     tags:
         - gitlab_clean
     image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest
@@ -122,8 +121,8 @@ clean-dev:release:
     rules:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
-clean:dockerhub:dev:
-    stage: clean-dev-release
+clean:dev:dockerhub:
+    stage: clean
     tags:
         - clean
         - dind
@@ -161,7 +160,7 @@ release:dockerhub:latest:
     rules:
          - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
-release_job:
+release:gitlab:
     stage: release
     tags:
         - release