Merge remote-tracking branch 'remotes/origin/2024Q2_RC' into develop

ci-templates/build.yml

@@ -21,7 +21,7 @@
         echo "Pushing Docker image with tag 'latest'"
         export DOCKER_TAG=latest
       fi
-    - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${CI_REGISTRY_IMAGE}:$APP_VERSION"
+    - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${CI_REGISTRY_IMAGE}:$DOCKER_TAG"
 
 .angular_build:
   extends: .default