diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5fd70885c8fc93623c478322945b0da6dc9d3cc4..89f529039d8b29db74176a73fdd2e8e1a2a52c44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,18 +94,18 @@ push-release-image-gitlab:
   extends: .get-version
   script:
     - mvn versions:set -DnewVersion=${CI_COMMIT_TAG} $MAVEN_CLI_OPTS
-    - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:release-${PROJECT_VERSION},${CI_REGISTRY_IMAGE}:latest"
+    - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:release-${CI_COMMIT_TAG},${CI_REGISTRY_IMAGE}:latest"
     - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
-    # - if: $CI_COMMIT_TAG
-    - when: never  # Step disabled until gitlab container registry works
+    - if: $CI_COMMIT_TAG
+      when: never  # Step disabled until gitlab container registry works
 
 push-release-image-nexus:
   stage: publish
   extends: .get-version
   script:
     - mvn versions:set -DnewVersion=${CI_COMMIT_TAG} $MAVEN_CLI_OPTS
-    - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:release-${CI_COMMIT_TAG},${CI_REGISTRY_IMAGE}:latest"
+    - export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:release-${CI_COMMIT_TAG},${NEXUS_IMAGE_PREFIX}:latest"
     - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
     - if: $CI_COMMIT_TAG