diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4e932e..5d7afe0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,29 @@
-image: docker:stable
-
-variables:
-  DOCKER_HOST: tcp://docker:2375/
-  DOCKER_DRIVER: overlay2
+image: docker:cli
 
 services:
   - docker:dind
 
 stages:
   - build
+  - deploy
 
 build:
   stage: build
   script:
     - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+  # Run this job in a branch where a Dockerfile exists
+  rules:
+    - if: $CI_COMMIT_BRANCH
+      exists:
+        - Dockerfile
+
+deploy:
+  stage: deploy
+  script:
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  tags:
+    - docker
   only:
     - tags
-
-after_script:
-  - docker images --filter "dangling=true" -q --no-trunc | xargs -r docker rmi
+  when: on_success