diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f0b9f15bc2553f3742a7c9fb9f36a48e149805c..9d925c58081f814b42fd50601cd255987160c808 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,11 +52,12 @@ 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/app:$CI_COMMIT_TAG
+    CLIENT_IMAGE_TAG: $CI_REGISTRY_IMAGE/client:$CI_COMMIT_TAG
+    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE/client:latest
   script:
     - cd app/client
     - docker build -t $CLIENT_IMAGE_TAG .
-    - docker tag $CI_COMMIT_TAG
+    - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG
     - docker image push --all-tags $CLIENT_IMAGE_TAG
 
 build_server: