diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ec4df4ab9bff2ae9e3ef0392ed45c01eb1f93e2..f86f0ac5a71a8415e93ce2698c9283111797530a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,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:app-$CI_COMMIT_TAG
-    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:app-latest
+    CLIENT_IMAGE_TAG: $CI_REGISTRY/client:$CI_COMMIT_TAG
+    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/client:latest
   script:
     - cd app/client
     - docker build -t $CLIENT_IMAGE_TAG .
@@ -76,8 +76,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_TAG
-    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:server-latest
+    SERVER_IMAGE_TAG: $CI_REGISTRY/server:$CI_COMMIT_TAG
+    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/server:latest
   script:
     - cd app/server
     - docker build -t $SERVER_IMAGE_TAG .