diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93cd2665c3c0cb9640f9f33351cdebc8d34813c5..2cff179ad106108678cbbff897887fa3201f45ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,7 @@ before_script:
     > /kaniko/.docker/config.json
 
 variables:
-  LATEST_NAME: $CI_REGISTRY_IMAGE/$IMAGE_NAME
-  UNIQUE_NAME: $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHA
-  DEPLOY_NAME: $CI_REGISTRY_IMAGE/$IMAGE_NAME:stable
+  IMAGE_NAME: server
 
 build:
   stage: build
@@ -25,8 +23,8 @@ build:
       /kaniko/executor
       --context $CI_PROJECT_DIR
       --dockerfile Dockerfile
-      --destination $LATEST_NAME
-      --destination $UNIQUE_NAME
+      --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME
+      --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHA
 
 deploy:
   stage: deploy
@@ -35,6 +33,6 @@ deploy:
       /kaniko/executor
       --context $CI_PROJECT_DIR
       --dockerfile Dockerfile
-      --destination $DEPLOY_NAME
+      --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:stable
   only:
     - deploy