diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3739518d..37dab41f 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,6 @@ lint_python_on_merge_request:
     script:
      - echo "Linting Python code"
      - pip install --upgrade -q pip && pip install -q black && black --fast --check .
-     - echo $CI_JOB_ID
 
 build_and_push_container:
   stage: deploy
@@ -26,8 +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:$CI_JOB_ID .
-    - docker push ldooks/dragon-bot:$CI_JOB_ID
-    - 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