diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a847a94a73192ee494aa8886cbd773dc7c89666c..8f121d55e22dfe53b1c4da0960b309285694518f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,8 @@ variables:
   stage: deploy
   tags: *tags
   script:
-    - docker tag "$HASH" "registry.shore.co.il/$IMAGE:$TAG"
-    - docker push "registry.shore.co.il/$IMAGE:$TAG"
+    - docker tag "$HASH" "registry.shore.co.il/$IMAGE:${TAG:-latest}"
+    - docker push "registry.shore.co.il/$IMAGE:${TAG:-latest}"
   rules: *rules
 
 # cgit image:
@@ -56,6 +56,7 @@ build-cgit:
 push-cgit:
   extends: .push
   variables:
+    CONTEXT: cgit
     IMAGE: cgit
   needs:
     - job: build-cgit
@@ -116,6 +117,7 @@ build-sshd:
 push-sshd:
   extends: .push
   variables:
+    CONTEXT: sshd
     IMAGE: sshd
   needs:
     - job: build-sshd