diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index a60e871e472d66839a9ec2ee803050c6089ae2b2..42d7a53a701c58c7abeec98c2fe1743a1776929e 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -15,13 +15,21 @@
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
   script:
-    - export DOCKER_TAG=$APP_VERSION
+    - export BRANCH_NAME=$(echo "$CI_COMMIT_REF_NAME" | tr '/' '-')
     - |
       if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
         echo "Pushing Docker image with tag 'latest'"
-        export DOCKER_TAG=latest
+        /kaniko/executor \
+          --context "${CI_PROJECT_DIR}" \
+          --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
+          --destination "${CI_REGISTRY_IMAGE}:$BRANCH_NAME" \
+          --destination "${CI_REGISTRY_IMAGE}:latest"
+      else
+        /kaniko/executor \
+          --context "${CI_PROJECT_DIR}" \
+          --dockerfile "${CI_PROJECT_DIR}/Dockerfile" \
+          --destination "${CI_REGISTRY_IMAGE}:$BRANCH_NAME"
       fi
-    - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${CI_REGISTRY_IMAGE}:$APP_VERSION"
 
 .angular_build:
   extends: .default