diff --git a/handlers/main.yml b/handlers/main.yml
index 5dc1e6c..5fa944a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,12 +4,6 @@
     name: munge
     state: restarted
 
-- name: Reload slurmdbd
-  ansible.builtin.service:
-    name: "{{ slurmdbd_service_name }}"
-    state: reloaded
-  when: "(slurm_start_services | bool) and ('slurmdbdservers' in group_names or 'dbd' in slurm_roles)"
-
 - name: Restart slurmdbd
   ansible.builtin.systemd:
     name: "{{ slurmdbd_service_name }}"
@@ -18,18 +12,16 @@
     enabled: yes
     daemon_reload: yes
   when: "(slurm_start_services | bool) and ('slurmservers' in group_names or 'controller' in slurm_roles)"
+  register: slurmdbd_restart
 
-- name: Restart slurmdbd
+- name: Reload slurmdbd
   ansible.builtin.service:
     name: "{{ slurmdbd_service_name }}"
-    state: restarted
-  when: "slurm_start_services and ('slurmdbdservers' in group_names or 'dbd' in slurm_roles)"
-
-- name: Reload slurmctld
-  ansible.builtin.service:
-    name: "{{ slurmctld_service_name }}"
     state: reloaded
-  when: "(slurm_start_services | bool) and ('slurmservers' in group_names or 'controller' in slurm_roles)"
+  when:
+    - slurm_start_services | bool
+    - ('slurmdbdservers' in group_names or 'dbd' in slurm_roles)
+    - slurmdbd_restart is not defined
 
 - name: Restart slurmctld
   ansible.builtin.systemd:
@@ -39,15 +31,29 @@
     enabled: yes
     daemon_reload: yes
   when: "(slurm_start_services | bool) and ('slurmservers' in group_names or 'controller' in slurm_roles)"
+  register: slurmctld_restart
 
-- name: Reload slurmd
+- name: Reload slurmctld
   ansible.builtin.service:
-    name: "{{ slurmd_service_name }}"
+    name: "{{ slurmctld_service_name }}"
     state: reloaded
-  when: "(slurm_start_services | bool) and ('slurmexechosts' in group_names or 'exec' in slurm_roles)"
+  when:
+    - slurm_start_services | bool
+    - ('slurmservers' in group_names or 'controller' in slurm_roles)
+    - slurmctld_restart is not defined
 
 - name: Restart slurmd
   ansible.builtin.service:
     name: "{{ slurmd_service_name }}"
     state: restarted
   when: "(slurm_start_services | bool) and ('slurmexechosts' in group_names or 'exec' in slurm_roles)"
+  register: slurmd_restart
+
+- name: Reload slurmd
+  ansible.builtin.service:
+    name: "{{ slurmd_service_name }}"
+    state: reloaded
+  when:
+    - slurm_start_services | bool
+    - ('slurmexechosts' in group_names or 'exec' in slurm_roles)
+    - slurmd_restart is not defined