diff --git a/tasks/docker_setup.yml b/tasks/docker_setup.yml
index fa081bd..e1dfe62 100644
--- a/tasks/docker_setup.yml
+++ b/tasks/docker_setup.yml
@@ -9,26 +9,25 @@
 
     - name: Install the Docker daemon config
       template: src=daemon.json.j2 dest=/etc/docker/daemon.json owner=root group=root mode=0644
-      when: ansible_service_mgr != 'systemd'
       notify: Restart docker
       tags: [ 'docker', 'docker_conf' ]
 
     - name: Create the docker service systemd directory
       file: dest=/etc/systemd/system/docker.service.d state=directory mode=0755
       when: ansible_service_mgr == 'systemd'
-      tags: [ 'docker', 'docker_systemd' ]
+      tags: [ 'docker', 'docker_systemd', 'docker_conf' ]
 
     - name: Install the Docker additional systemd unit
       template: src=docker-systemd-override.conf.j2 dest=/etc/systemd/system/docker.service.d/override.conf owner=root group=root mode=0644
       when: ansible_service_mgr == 'systemd'
       notify: Restart docker
       register: reload_systemd
-      tags: [ 'docker', 'docker_systemd' ]
+      tags: [ 'docker', 'docker_systemd', 'docker_conf' ]
 
     - name: systemd reload
       command: systemctl daemon-reload
       when: reload_systemd is defined and reload_systemd is changed
-      tags: [ 'docker', 'docker_systemd' ]
+      tags: [ 'docker', 'docker_systemd', 'docker_conf' ]
 
     - name: Ensure that the service is started and enabled
       service: name=docker state=started enabled=yes