diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 348c9b7b0800d92c6603bd5bd72e30342cfc506d..8d8332bd5b598a118d55c8d1308fc2ceea8557c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,9 @@ build:web:
     - ./manage.sh styles
     - ./manage.sh grunt_build
 
-build:docker:
+
+
+.build:docker:
   stage: build
   image: docker:git
   services:
@@ -32,10 +34,20 @@ build:docker:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   script:
-    - docker build -t $CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-latest} .
-    - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-latest}
+    - docker build -t $CI_REGISTRY_IMAGE .
+    - docker push $CI_REGISTRY_IMAGE
+
+build:docker:master:
+  extends: .build:docker
   only:
     - master
+
+build:docker:tags:
+  extends: .build:docker
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  only:
     - tags
 
 test:unit: