diff --git a/roles/slurm-from-source/tasks/installMungeFromSource.yml b/roles/slurm-from-source/tasks/installMungeFromSource.yml
index e7a594498b7f49d15c5642fcab1a2898755d28a9..11d376a5e6c11db63673c9b52b37959292b580b7 100644
--- a/roles/slurm-from-source/tasks/installMungeFromSource.yml
+++ b/roles/slurm-from-source/tasks/installMungeFromSource.yml
@@ -1,9 +1,3 @@
-- name: clean up system installation
-  shell: rpm -e munge-libs slurm-munge munge slurm-plugins munge-devel slurm slurm-slurmdbd slurm-perlapi slurm-devel slurm-pam_slurm slurm-sjstat slurm-perlapi slurm-pam_slurm slurm-slurmdb-direct slurm-torque slurm-sjobexit
-  ignore_errors: true
-  sudo: true
-  when: ansible_os_family == 'RedHat'
-
 - name: get munge
   shell: wget https://munge.googlecode.com/files/munge-{{ munge_version }}.tar.bz2
   args:
diff --git a/roles/slurm-from-source/tasks/main.yml b/roles/slurm-from-source/tasks/main.yml
index 7549c00e2c6ed81c9ccfab4260062329f09d720a..6a7570b94e0295447d9c3a1aab8ea10e851ed70e 100644
--- a/roles/slurm-from-source/tasks/main.yml
+++ b/roles/slurm-from-source/tasks/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: clean up system installation
-  shell: rpm -e munge munge-libs munge-devel slurm slurm-sql
-  ignore_errors: true
-  sudo: true
-  when: ansible_os_family == 'RedHat' 
-
 - name: create munge group
   group: name=munge system=yes gid=498
   sudo: true
diff --git a/roles/slurm-from-source/templates/slurm.conf.j2 b/roles/slurm-from-source/templates/slurm.conf.j2
index b8d0753a9e4dd75d430da09933f153114ed51aa0..ac0ebfe6e1983851c81fc89c1486eb9c0c3639d2 100644
--- a/roles/slurm-from-source/templates/slurm.conf.j2
+++ b/roles/slurm-from-source/templates/slurm.conf.j2
@@ -21,12 +21,12 @@ SlurmdPort=6818
 AuthType=auth/munge
 #JobCredentialPrivateKey=
 #JobCredentialPublicCertificate=
-StateSaveLocation={{ slurmdatadir }}
-SlurmdSpoolDir={{ slurmdatadir }} 
+StateSaveLocation={{ slurm_dir }}/var/state
+SlurmdSpoolDir={{ slurm_dir }}/var/spool
 SwitchType=switch/none
 MpiDefault=none
-SlurmctldPidFile=/var/run/slurmctld.pid
-SlurmdPidFile=/var/run/slurmd.pid
+SlurmctldPidFile={{ slurm_dir }}/var/run/slurmctld.pid
+SlurmdPidFile={{ slurm_dir }}/var/run/slurmd.pid
 ProctrackType=proctrack/pgid
 #PluginDir=
 CacheGroups=0
@@ -76,21 +76,21 @@ FastSchedule={{ slurmfastschedule }}
 # LOGGING
 {% if slurmctlddebug %}
 SlurmctldDebug={{ slurmctlddebug.level }}
-SlurmctldLogFile={{ slurmctlddebug.log }}
+SlurmctldLogFile={{ slurm_dir }}{{ slurmctlddebug.log }}
 {% else %}
 #SlurmctldDebug=
 #SlurmctldLogFile=
 {% endif %}
 {% if slurmddebug %}
 SlurmdDebug={{ slurmddebug.level }}
-SlurmdLogFile={{ slurmddebug.log }}
+SlurmdLogFile={{ slurm_dir }}{{ slurmddebug.log }}
 {% else %}
 #SlurmdDebug=
 #SlurmdLogFile=
 {% endif %}
 {% if slurmschedlog %}
 SlurmSchedlogLevel={{ slurmschedlog.level }}
-SlurmSchedLogFile={{ slurmschedlog.log }}
+SlurmSchedLogFile={{ slurm_dir }}{{ slurmschedlog.log }}
 {% else %}
 #SlurmSchedlogLevel=
 #SlurmSchedLogFile=