diff --git a/handlers/main.yml b/handlers/main.yml
index b9007b599706706d4b5a724887e821d6490d601d..8d537decf5ed2c30438fe4d0b18aa8cc4fd0a300 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,8 @@
 ---
 
 - name: restart docker daemon
-  service: name=docker state=restarted
+  ansible.builtin.command:
+    cmd: /usr/bin/systemctl reload-or-restart docker.service
 
 - name: start inverseproxy docker
   docker_compose:
diff --git a/tasks/main.yml b/tasks/main.yml
index 27173821e3c6d9894b26a82a17bac72ae98cd2db..9a12cfc2028750083ce26214d4bb6b610349f93c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -160,6 +160,16 @@
 - name: Flush handlers
   meta: flush_handlers
 
+- name: Enable service docker
+  ansible.builtin.service:
+    name: docker
+    enabled: yes
+
+- name: Start service docker, if not started
+  ansible.builtin.service:
+    name: docker
+    state: started
+
 - name: Retrieve subuid for dockremap
   command: grep dockremap /etc/subuid
   register: dockremap_subuid_output