diff --git a/defaults/main.yml b/defaults/main.yml
index a190310..3699ac8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -83,9 +83,9 @@ slurm_version: "15.08.3"
 slurm_type: ""
 slurm_build: False
 slurm_log_dir: "/var/log/slurm"
-slurm_tmp_dir: "/var/tmp/slurmd"
+slurm_tmp_dir: "/slurmdb/tmp/slurmd"
 slurmd_tmp_dir: "{{ slurm_tmp_dir }}"
-slurm_state_dir: "/tmp/slurmstate"
+slurm_state_dir: "/slurmdb/tmp"
 ##
 slurm_service_node: "{{ hostvars[groups['slurm_service'][0]]['ansible_hostname']  }}"
 slurm_clustername: "{{ siteName | default('test_cluster')}}"
diff --git a/tasks/common.yml b/tasks/common.yml
index 9eaf343..098f31c 100644
--- a/tasks/common.yml
+++ b/tasks/common.yml
@@ -46,7 +46,7 @@
   - name: add slurm tmp dir
     file: "path={{ slurmd_tmp_dir }} state=directory owner=slurm group=slurm mode=0750"
 
-  - name: add slurm tmp dir
+  - name: add slurm state dir
     file: "path={{ slurm_state_dir }} state=directory owner=slurm group=slurm mode=0750"