diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40172d2..b869df2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,10 @@ before_script:
 .build_and_deploy: &build_and_deploy
   stage: build
   script:
-    - docker build -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" -f "Dockerfile.$CI_JOB_NAME" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
+    - docker build -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" -f "Dockerfile.$CI_JOB_NAME" .
+    - docker tag "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest"
+    - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA"
+    - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest"
   only:
     - master
 
@@ -45,8 +47,10 @@ before_script:
 .build_and_deploy_custom: &build_and_deploy_custom
   stage: build
   script:
-    - ./scripts/custom-docker-build $CI_JOB_NAME -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
-    - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
+    - ./scripts/custom-docker-build $CI_JOB_NAME -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA"
+    - docker tag "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest"
+    - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA"
+    - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest"
   only:
     - master