diff --git a/handlers/main.yml b/handlers/main.yml
index 2af4d81..2332e4a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,7 @@
 ---
+- name: systemd reload
+  systemd:
+    daemon_reload: yes
 
 - name: reload slurmd
   service:
diff --git a/tasks/slurmdbd.yml b/tasks/slurmdbd.yml
index ca4fd2f..adcd157 100644
--- a/tasks/slurmdbd.yml
+++ b/tasks/slurmdbd.yml
@@ -8,10 +8,13 @@
 - name: Install slurmdbd.conf
   template:
     src: generic.conf.j2
-    dest: "{{ slurm_config_dir }}/slurmdbd.conf"
+    dest: "{{ slurm_config_dir }}/{{ item.name }}"
     owner: "{{ __slurm_user_name }}"
     group: root
     mode: 0400
+  with_items:
+    - name: slurmdbd.conf
+      config: __slurmdbd_config_merged
   notify:
     - reload slurmdbd
 
@@ -23,3 +26,19 @@
     mode: 0755
     state: directory
   when: slurm_create_dirs and __slurmdbd_config_merged.LogFile
+
+- name: Directory of Pidfile must exist
+  file:
+    state: directory
+    path: "{{ __slurmdbd_config_merged.PidFile | dirname }}"
+  when: __slurmdbd_config_merged.PidFile is defined
+
+- name: Service slurmdbd , option PIDFile
+  lineinfile:
+    path: /lib/systemd/system/slurmdbd.service
+    regexp: 'PIDFile'
+    line: "PIDFile={{ __slurmdbd_config_merged.PidFile }}"
+  when: __slurmdbd_config_merged.PidFile is defined
+  notify:
+    - systemd reload
+    - reload slurmdbd