diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index 03f245334e4f8d31e47f034b55610c125c85572a..b8839f24a0a122ee068f81957e2b0668cb65719b 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: set use_systemd
-  set_fact: 
+  set_fact:
     use_systemd: True
   when: (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") and
-          ( ansible_distribution_major_version == "7") 
+          ( ansible_distribution_major_version == "7")
 
 - name: set slurmd_enabled (default enabled)
   set_fact:
@@ -38,18 +38,21 @@
   when: use_systemd is defined and start_slurmctld is defined
   register: slurmctld_service_installed
 
-- name: reload systemd
-  shell: systemctl daemon-reload
+- name: reload systemd after slurmd install
+  systemd:
+    daemon_reload: yes
   become: true
   when: use_systemd is defined and start_slurmd is defined and slurmd_service_installed.changed
 
-- name: reload systemd
-  shell: systemctl daemon-reload
+- name: reload systemd after slurmctld _service _installed
+  systemd:
+    daemon_reload: yes
   become: true
   when: use_systemd is defined and start_slurmctld is defined and slurmctld_service_installed.changed
 
-- name: reload systemd
-  shell: systemctl daemon-reload
+- name: reload systemd slurmdbd_ service _installed
+  systemd:
+    daemon_reload: yes
   become: true
   when: use_systemd is defined and start_slurmdbd is defined and slurmdbd_service_installed.changed
 
@@ -64,7 +67,9 @@
 
 
 - name: "create cluster in slurm db"
-  shell:  {{ slurm_dir }}/bin/sacctmgr show assoc format=Cluster -Pn | grep -q {{ clustername }} && {{ slurm_dir }}/bin/sacctmgr -i create cluster {{ clustername }}
+  shell:
+    cmd: ./sacctmgr show assoc format=Cluster -Pn | grep -q {{ clustername }} && ./sacctmgr -i create cluster {{ clustername }}"
+    chdir: "{{ slurm_dir }}/bin/"
   become: true
 
 - name: start slurmctl