diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87fe82d013c3e12cb38122c2ff2086cbcd7a3db7..627d92505bc9a7a8be9ecdbf26f87eac7874c9b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,7 @@ push-merge-request-image-gitlab:
   stage: publish
   extends: .get-version
   script:
+    - export PRIMARY_IMAGE_TAG=${MERGE_REQUEST_TAG}
     - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:${MERGE_REQUEST_TAG},${CI_REGISTRY_IMAGE}:${MERGE_REQUEST_TAG}-${CI_COMMIT_SHORT_SHA}"
     - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
@@ -79,6 +80,7 @@ push-merge-request-image-nexus:
   stage: publish
   extends: .get-version
   script:
+    - export PRIMARY_IMAGE_TAG=${MERGE_REQUEST_TAG}
     - export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:${MERGE_REQUEST_TAG},${NEXUS_IMAGE_PREFIX}:${MERGE_REQUEST_TAG}-${CI_COMMIT_SHORT_SHA}"
     - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
@@ -109,6 +111,7 @@ push-snapshot-image-gitlab:
   stage: publish
   extends: .get-version
   script:
+    - export PRIMARY_IMAGE_TAG=${SNAPSHOT_TAG}
     - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:${SNAPSHOT_TAG},${CI_REGISTRY_IMAGE}:${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA},${CI_REGISTRY_IMAGE}:snapshot-latest"
     - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   only:
@@ -118,6 +121,7 @@ push-snapshot-image-nexus:
   stage: publish
   extends: .get-version
   script:
+    - export PRIMARY_IMAGE_TAG=${SNAPSHOT_TAG}
     - export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG},${NEXUS_IMAGE_PREFIX}:${SNAPSHOT_TAG}-${CI_COMMIT_SHORT_SHA},${NEXUS_IMAGE_PREFIX}:snapshot-latest"
     - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   only:
@@ -172,6 +176,7 @@ push-release-image-gitlab:
   extends: .get-version
   script:
     - mvn versions:set -DnewVersion=${CI_COMMIT_TAG} $MAVEN_CLI_OPTS
+    - export PRIMARY_IMAGE_TAG=${CI_COMMIT_TAG}
     - export IMAGE_TAGS="${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG},${CI_REGISTRY_IMAGE}:latest"
     - mvn deploy -Pgitlab-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
@@ -182,6 +187,7 @@ push-release-image-nexus:
   extends: .get-version
   script:
     - mvn versions:set -DnewVersion=${CI_COMMIT_TAG} $MAVEN_CLI_OPTS
+    - export PRIMARY_IMAGE_TAG=${CI_COMMIT_TAG}
     - export IMAGE_TAGS="${NEXUS_IMAGE_PREFIX}:${CI_COMMIT_TAG},${NEXUS_IMAGE_PREFIX}:latest"
     - mvn deploy -Pnexus-deploy $MAVEN_DEPLOY_CLI_OPTS $MAVEN_CLI_OPTS
   rules:
diff --git a/pom.xml b/pom.xml
index 65ca55a35ae44322b75a16d96a6acc4e2b2a2dc9..d9dd35129b6bb4418482718af2f0b1afb210680b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
 							<image>
-								<name>${CI_REGISTRY_IMAGE}/${project.artifactId}</name>
+								<name>${CI_REGISTRY_IMAGE}:${PRIMARY_IMAGE_TAG}</name>
 								<tags>${IMAGE_TAGS}</tags>
 								<publish>true</publish>
 							</image>
@@ -286,7 +286,7 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
 							<image>
-								<name>docker.ozg-sh.de/${project.artifactId}</name>
+								<name>docker.ozg-sh.de/${project.artifactId}:${PRIMARY_IMAGE_TAG}</name>
 								<tags>${IMAGE_TAGS}</tags>
 								<publish>true</publish>
 							</image>