diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 58396a02af..ab74770296 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -42,18 +42,6 @@
 - name: restart jenkins
   action: service name=jenkins state=restarted
 
-- name: restart koschei-polling
-  action: service name=koschei-polling state=restarted
-
-- name: restart koschei-resolver
-  action: service name=koschei-resolver state=restarted
-
-- name: restart koschei-scheduler
-  action: service name=koschei-scheduler state=restarted
-
-- name: restart koschei-watcher
-  action: service name=koschei-watcher state=restarted
-
 - name: restart libvirtd
   action: service name=libvirtd state=restarted
 
diff --git a/roles/koschei/handlers/main.yml b/roles/koschei/handlers/main.yml
new file mode 100644
index 0000000000..5c37b87c06
--- /dev/null
+++ b/roles/koschei/handlers/main.yml
@@ -0,0 +1,11 @@
+- name: restart koschei-polling
+  action: service name=koschei-polling state=restarted
+
+- name: restart koschei-resolver
+  action: service name=koschei-resolver state=restarted
+
+- name: restart koschei-scheduler
+  action: service name=koschei-scheduler state=restarted
+
+- name: restart koschei-watcher
+  action: service name=koschei-watcher state=restarted