diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 159d8343..37dab41f 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ stages:
   - test
   - deploy
 
-
 lint_python_on_merge_request:
     image: python:alpine
     stage: test
@@ -26,7 +25,7 @@ build_and_push_container:
     - echo "Wait for Docker daemon at tcp://localhost:2375"
     - while ! nc -z localhost 2375; do sleep 0.1; done # Wait until docker socket is available
     - docker login -u ldooks -p $DOCKER_ACCESS_TOKEN
-    - docker build -t ldooks/dragon-bot:latest .
-    - docker push ldooks/dragon-bot:latest
+    - docker build -t ldooks/dragon-bot:$CI_PIPELINE_ID -t ldooks/dragon-bot:latest .
+    - docker push ldooks/dragon-bot --all-tags
   only:
     - master