diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b20b5c8..1a965b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,9 @@
 stages:
-  - auth
-  - build
-  - publish
+  - docker
   - deploy
 
-auth-job:
-  stage: auth
+docker-auth-job:
+  stage: docker
   image: docker:stable
   only:
     refs:
@@ -17,8 +15,8 @@ auth-job:
     paths:
       - build/.dockerconfigjson
 
-build-job:
-  stage: build
+docker-build-job:
+  stage: docker
   image: docker:stable
   only:
     refs:
@@ -28,17 +26,17 @@ build-job:
   script:
     - docker -H unix:///var/run/docker.sock image build -t "$REGISTRY_BASE_URL/$DOCKER_IMAGE_NAME:$CI_COMMIT_SHORT_SHA" ./
 
-publish-job:
-  stage: publish
+docker-publish-job:
+  stage: docker
   image: docker:stable
   only:
     refs:
       - master
   needs:
-    - auth-job
-    - build-job
+    - docker-auth-job
+    - docker-build-job
   dependencies:
-    - auth-job
+    - docker-auth-job
   tags:
     - docker
   script:
@@ -54,10 +52,10 @@ deploy-job:
   when: manual
   image: google/cloud-sdk
   needs:
-    - auth-job
-    - publish-job
+    - docker-auth-job
+    - docker-publish-job
   dependencies:
-    - auth-job
+    - docker-auth-job
   script:
     - export KUBECONFIG="$KUBE_AUTH"
     - cp "$ENV_PRODUCTION" "./build/.env.production"