diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38890c35..62b3be29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ before_script:
 
 stages:
   - test
-  - build
   - deploy
 
 linting_python:
@@ -20,19 +19,11 @@ linting_python:
   tags:
     - python
 
-building_docker_container:
+build_and_push_container:
   stage: build
-  script:
-    - docker build -t ldooks/dragon-bot:latest .
-  only:
-    - master
-  tags:
-    - docker
-
-pushing_docker_container:
-  stage: deploy
   script:
     - docker login -u ldooks -p $DOCKER_PASSWORD
+    - docker build -t ldooks/dragon-bot:latest .
     - docker push ldooks/dragon-bot:latest
   only:
     - master