diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d82502b4fe8fd7f590f57105f05647bcae97a2ad..883c629234908c972a5ee61e6daf2ae89409f5e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,11 +40,18 @@ test_server:
     - master # only for now to speed up dev
 
 build_client:
+  before_script: docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  variables: 
+    CLIENT_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
+
   image: docker:19.03.12
   services:
     - docker:19.03.12-dind
   stage: build
   script:
-    - docker build -f app/client/Dockerfile -t ${}client:v0.0.1 .
+    - docker build -f app/client/Dockerfile -t $IMAGE_TAG .
+    - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG
+    - docker push $CLIENT_RELEASE_IMAGE_TAG
   only: 
     - master