diff --git a/repos/INSIGHT-Infra/ansible/roles/common/handlers/main.yml b/repos/INSIGHT-Infra/ansible/roles/common/handlers/main.yml
new file mode 100644
index 0000000..6ed27fa
--- /dev/null
+++ b/repos/INSIGHT-Infra/ansible/roles/common/handlers/main.yml
@@ -0,0 +1,10 @@
+---
+- name: restart chrony
+  service:
+    name: chrony
+    state: restarted
+
+- name: restart sshd
+  service:
+    name: sshd
+    state: restarted
diff --git a/repos/INSIGHT-Infra/ansible/roles/common/tasks/main.yml b/repos/INSIGHT-Infra/ansible/roles/common/tasks/main.yml
index 14cd7be..fff703e 100644
--- a/repos/INSIGHT-Infra/ansible/roles/common/tasks/main.yml
+++ b/repos/INSIGHT-Infra/ansible/roles/common/tasks/main.yml
@@ -74,14 +74,3 @@
     name: fail2ban
     state: started
     enabled: true
-
-handlers:
-  - name: restart chrony
-    service:
-      name: chrony
-      state: restarted
-
-  - name: restart sshd
-    service:
-      name: sshd
-      state: restarted
diff --git a/repos/INSIGHT-Infra/ansible/roles/docker/handlers/main.yml b/repos/INSIGHT-Infra/ansible/roles/docker/handlers/main.yml
new file mode 100644
index 0000000..3627303
--- /dev/null
+++ b/repos/INSIGHT-Infra/ansible/roles/docker/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: restart docker
+  service:
+    name: docker
+    state: restarted
diff --git a/repos/INSIGHT-Infra/ansible/roles/docker/tasks/main.yml b/repos/INSIGHT-Infra/ansible/roles/docker/tasks/main.yml
index e9c1d65..a598831 100644
--- a/repos/INSIGHT-Infra/ansible/roles/docker/tasks/main.yml
+++ b/repos/INSIGHT-Infra/ansible/roles/docker/tasks/main.yml
@@ -57,9 +57,3 @@
 - name: "Docker Version ausgeben"
   debug:
     msg: "{{ docker_version.stdout }}"
-
-handlers:
-  - name: restart docker
-    service:
-      name: docker
-      state: restarted