diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b2adf6036e71852c82b897efb20b734309ccdec..fbfdf903ea1e3b298e53d4ac1e00343f1e08280e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,13 +39,11 @@ build-custom-image:
     - docker:dind
   when: manual
   variables:
-    REGISTRY: registry.jsc.fz-juelich.de
-    REGISTRY_PATH: $REGISTRY/eflows4hpc-wp2/data-logistics-service/eflows-airflow
-    IMAGE_COMMIT_TAG: $REGISTRY_PATH:$CI_COMMIT_SHORT_SHA
-    IMAGE_LATEST_TAG: $REGISTRY_PATH:latest
+    IMAGE_COMMIT_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:$CI_COMMIT_SHORT_SHA
+    IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/eflows-airflow:latest
 
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $REGISTRY
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker build --no-cache=true --pull -t $IMAGE_COMMIT_TAG -f dockers/eflows-airflow.docker .
     - docker push $IMAGE_COMMIT_TAG
     - docker tag $IMAGE_COMMIT_TAG $IMAGE_LATEST_TAG