diff --git a/tasks/main.yml b/tasks/main.yml
index dd90c22..b6db5c0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,12 +11,15 @@
     state: "{{ docker_package_state }}"
   notify: restart docker
 
-- name: Ensure Docker is started and enabled at boot.
+- name: Configure docker service and socket state
   service:
-    name: docker
+    name: "docker.{{ item }}"
     state: "{{ docker_service_state }}"
     enabled: "{{ docker_service_enabled }}"
   ignore_errors: "{{ ansible_check_mode }}"
+  with_items:
+    - service
+    - socket
 
 - name: Ensure handlers are notified now to avoid firewall conflicts.
   meta: flush_handlers