diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9097935..6785f59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,15 +24,15 @@ build-and-push-image:
     - git submodule update --init
     - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" .
-    - podman push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
 
 push-retagged-branch:
   stage: push-retagged-branch
   script:
     - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - podman pull "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
-    - podman tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
-    - podman push "$CI_REGISTRY_IMAGE:latest"
+    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+    - podman tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - podman push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"
       when: on_success