diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 7f8bcc9..01c401b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -199,6 +199,14 @@
   tags:
     - config
 
+- name: "Remove docker daemon configuration when docker_enabled=false"
+  file:
+    state: absent
+    path: '/etc/docker/daemon.json'
+  when: docker_enabled == false
+  tags:
+    - config
+
 - name: "Insert/Update docker daemon configuration"
   template:
     src: 'configs/docker/daemon.json.j2'