diff --git a/basic/roles/docker/defaults/main.yml b/basic/roles/docker/defaults/main.yml
index be55782d478c00736327139830bfb32a7fa07dab..984d228b784176ccba4d3397f40c456c1a98393f 100644
--- a/basic/roles/docker/defaults/main.yml
+++ b/basic/roles/docker/defaults/main.yml
@@ -5,3 +5,5 @@ ipv6_enabled: false
 docker_config_path: /etc/docker/daemon.json
 docker_config_enabled: false
 docker_config: {}
+
+autoheal_enabled: false
diff --git a/basic/roles/docker/tasks/autoheal.yml b/basic/roles/docker/tasks/autoheal.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5740b4c57bf3578563dc7c6d38eac8c31cd1414e
--- /dev/null
+++ b/basic/roles/docker/tasks/autoheal.yml
@@ -0,0 +1,10 @@
+- name: Start Autoheal container
+  community.docker.docker_container:
+    name: autoheal
+    image: willfarrell/autoheal
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - AUTOHEAL_CONTAINER_LABEL=all
+    restart_policy: always
+    state: started
diff --git a/basic/roles/docker/tasks/main.yaml b/basic/roles/docker/tasks/main.yaml
index fd1e0c9844b9b18a03444df31c1f0cbe49073578..20b44c90e8af82fe320f5f1af86ccfb2dbccc7fe 100644
--- a/basic/roles/docker/tasks/main.yaml
+++ b/basic/roles/docker/tasks/main.yaml
@@ -55,6 +55,10 @@
   include_tasks: "ipv6.yml"
   when: ipv6_enabled
 
+- name: Enable Autoheal if condition is true
+  include_tasks: "autoheal.yml"
+  when: autoheal_enabled
+
 - name: Add daemon.json configuration
   include_tasks: "config.yaml"
   when: docker_config_enabled