diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc830ffef7514457faff05a004a53d5f881a01df..048e1663ba0e011f121b0480fa895cbc5a65b65a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,13 +88,10 @@ transfer_image:
   services:
     - docker:19.03.12-dind
   variables:
-    IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
     IMAGE_COMMIT_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build --no-cache=true --pull -f ./apiserver/Dockerfile -t $IMAGE_TAG .
-    - docker push $IMAGE_TAG
-    - docker tag $IMAGE_TAG $IMAGE_COMMIT_TAG
+    - docker build --no-cache=true --pull -f ./apiserver/Dockerfile -t $IMAGE_COMMIT_TAG .
     - docker push $IMAGE_COMMIT_TAG
 
 tag_release:
@@ -104,6 +101,7 @@ tag_release:
   services:
     - docker:19.03.12-dind
   variables:
+    IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE:latest
     IMAGE_STABLE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     IMAGE_COMMIT_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
   only:
@@ -111,6 +109,8 @@ tag_release:
   tags: [stable]
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker pull $IMAGE_TAG
-    - docker tag $IMAGE_TAG $IMAGE_STABLE_TAG
+    - docker pull $IMAGE_COMMIT_TAG
+    - docker tag $IMAGE_COMMIT_TAG $IMAGE_STABLE_TAG
+    - docker tag $IMAGE_COMMIT_TAG $IMAGE_LATEST_TAG
     - docker push $IMAGE_STABLE_TAG
+    - docker push $IMAGE_LATEST_TAG