diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a342181..ce9cb17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,10 @@ default:
     - gitlab-org-docker
 
 stages:
-  - test
-  - deploy
-  - deploy-gitlab
-  - deploy-gitlab-assets
-  - deploy-gitaly
+  - custom
+  - gitlab
+  - gitlab-assets
+  - gitaly
   - automation
 
 variables:
diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml
index 90c4e13..bccdbe4 100644
--- a/.gitlab/ci/definitions.yml
+++ b/.gitlab/ci/definitions.yml
@@ -1,5 +1,5 @@
 .build_and_push:
-  stage: deploy
+  stage: custom
   needs: []
   script:
     - ./scripts/lib/custom-docker-build
diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml
index ea0b84d..4896b4e 100644
--- a/.gitlab/ci/gitaly.images.yml
+++ b/.gitlab/ci/gitaly.images.yml
@@ -3,7 +3,7 @@ gitaly:
   needs: []
   extends:
     - .build_and_push
-  stage: deploy-gitaly
+  stage: gitaly
   parallel:
     matrix:
       - DEBIAN: ['bullseye']
diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index a76c292..991ac48 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -2,7 +2,7 @@
 gitlab:
   extends:
     - .build_and_push
-  stage: deploy-gitlab
+  stage: gitlab
   variables:
     LFS: '2.9'
     YARN: '1.22'
@@ -22,7 +22,7 @@ gitlab:
 gitlab-assets:
   extends:
     - .build_and_push
-  stage: deploy-gitlab-assets
+  stage: gitlab-assets
   variables:
     LFS: '2.9'
     YARN: '1.22'