diff --git a/handlers/main.yml b/handlers/main.yml
index e302edd..ea976ce 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,18 +1,19 @@
 ---
 
-# FIXME: these are all broken (they need to be run only when a particular
-# service is enabled on that host
-#- name: reload slurmd
-#  service:
-#    name: "{{ slurmd_service_name }}"
-#    state: reloaded
-#
-#- name: reload slurmctld
-#  service:
-#    name: "{{ slurmctld_service_name }}"
-#    state: reloaded
-#
-#- name: reload slurmdbd
-#  service:
-#    name: "{{ slurmdbd_service_name }}"
-#    state: reloaded
+- name: reload slurmd
+  service:
+    name: "{{ slurmd_service_name }}"
+    state: reloaded
+  when: "'slurmexechosts' in group_names"
+
+- name: reload slurmctld
+  service:
+    name: "{{ slurmctld_service_name }}"
+    state: reloaded
+  when: "'slurmservers' in group_names"
+
+- name: reload slurmdbd
+  service:
+    name: "{{ slurmdbd_service_name }}"
+    state: reloaded
+  when: "'slurmdbdservers' in group_names"
diff --git a/tasks/main.yml b/tasks/main.yml
index ae3d398..aee443f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -47,8 +47,7 @@
     mode: 0444
   notify:
     - reload slurmd
-    # FIXME: notify only for slurm controllers...
-    #- reload slurmctld
+    - reload slurmctld
 
 - name: Install slurmdbd.conf
   template: