diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c67f61..067bcd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 variables:
   REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
-  IMAGE_NAME: $REGISTRY/$CI_PROJECT_NAME
+  IMAGE_NAME_PREFIX: $REGISTRY/$CI_PROJECT_NAME
   DTRACK_API_URL: https://dtrack-api-rd.krohne.com
   DEFECTDOJO_API_URL: https://defectdojo-rd.krohne.com
   KROHNE_CA_URL: https://devwiki.krohnegroup.com/lib/exe/fetch.php?media=krohne-ca.crt
@@ -92,11 +92,13 @@ generate-defectdojo-api:
 dockerize-cli:
   extends: .dockerize
   variables:
+    IMAGE_NAME_SUFFIX: cli
     DOCKERFILE: Dockerfile-cli
 
 dockerize-server:
   extends: .dockerize
   variables:
+    IMAGE_NAME_SUFFIX: server
     DOCKERFILE: Dockerfile-server
 
 .deploy:
@@ -106,6 +108,7 @@ dockerize-server:
     GIT_STRATEGY: none
     SERVICE: sbom-dd-dt-integrator
   script:
+    - IMAGE_NAME=$IMAGE_NAME_PREFIX"-server"
     - VERSION=$CI_COMMIT_SHA
     - CONTAINER_NAME=$SERVICE"-"$INSTANCE_SPECIFIER
     - SERVICE_VOLUME=$SERVICE"-"$INSTANCE_SPECIFIER"-data"