diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bab44d1c9df0ba7b3823f01aaa2634f8477f47f..c77efa01868167f055ef606973cb22c974ac0aec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,8 @@ build_client:
     - echo $CI_REGISTRY_USER
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   variables: 
-    CLIENT_IMAGE_TAG: $CI_REGISTRY_IMAGE/client:$CI_COMMIT_REF_SLUG
-    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE/client:latest
+    CLIENT_IMAGE_TAG: $CI_REGISTRY_IMAGE_client:$CI_COMMIT_REF_SLUG
+    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE_client:latest
   script:
     - cd app/client
     - docker build -t $CLIENT_IMAGE_TAG .
@@ -73,8 +73,8 @@ build_server:
     - echo $CI_REGISTRY_USER
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   variables: 
-    SERVER_IMAGE_TAG: $CI_REGISTRY_IMAGE/server:$CI_COMMIT_REF_SLUG
-    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE/server:latest
+    SERVER_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
   script:
     - cd app/server
     - docker build -t $SERVER_IMAGE_TAG .