diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77efa01868167f055ef606973cb22c974ac0aec..aa61f55a61b76c8b390ee4ebf5efd03e2845104c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,9 @@ build_client:
   tags: 
     - docker-privileged
   image: docker:19.03.12
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: always
   services:
     - docker:19.03.12-dind
   before_script: 
@@ -51,13 +54,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_client:$CI_COMMIT_REF_SLUG
-    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE_client:latest
+    CLIENT_IMAGE_TAG: $CI_REGISTRY_IMAGE#app:$CI_COMMIT_TAG
   script:
     - cd app/client
     - docker build -t $CLIENT_IMAGE_TAG .
-    - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG
-    - docker push $CLIENT_RELEASE_IMAGE_TAG
+    - docker tag $CI_COMMIT_TAG
+    - docker push --all-tags $CLIENT_IMAGE_TAG
   only: 
     - master
 
@@ -65,6 +67,9 @@ build_server:
   stage: build
   tags: 
     - docker-privileged
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: always
   image: docker:19.03.12
   services:
     - docker:19.03.12-dind