diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbd2dedaf2bbf0295189b76f9f47f3f895649b24..f3abad278a3f4052db9b13361f90de1eba76e7ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,8 @@ ci_test_image:
     - docker info
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t docker.greenhost.net/openappstack/bootstrap/bootstrap-ci test/
-    - docker push docker.greenhost.net/openappstack/bootstrap/bootstrap-ci
+    - docker build -t ${CI_REGISTRY_IMAGE}/bootstrap-ci test/
+    - docker push ${CI_REGISTRY_IMAGE}/bootstrap-ci
   only:
     changes:
       - test/Dockerfile
@@ -26,8 +26,8 @@ control_image:
     - docker info
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build -t docker.greenhost.net/openappstack/bootstrap/oas-control control/
-    - docker push docker.greenhost.net/openappstack/bootstrap/oas-control
+    - docker build -t ${CI_REGISTRY_IMAGE}/oas-control control/
+    - docker push ${CI_REGISTRY_IMAGE}/oas-control
   only:
     changes:
       - control/**/*