diff --git a/roles/calculateSlurmConf/tasks/main.yml b/roles/calculateSlurmConf/tasks/main.yml
index ed39703643e3a03d10fb766aac80a9a03b77e644..800ad4a5db8148fe6ff6a02d2906285ba157deed 100644
--- a/roles/calculateSlurmConf/tasks/main.yml
+++ b/roles/calculateSlurmConf/tasks/main.yml
@@ -4,3 +4,10 @@
 
 - name: fetch slurm.conf
   fetch: src=/tmp/slurm.conf dest=files/slurm.conf flat=yes
+
+- name: "Templating slurmdbd.conf"
+  template: src=slurmdbd.conf.j2 dest=/tmp/slurmdbd.conf owner=root group=root mode=644
+  sudo: true
+
+- name: fetch slurm.conf
+  fetch: src=/tmp/slurmdbd.conf dest=files/slurmdbd.conf flat=yes
diff --git a/roles/calculateSlurmConf/templates/slurm.conf.j2 b/roles/calculateSlurmConf/templates/slurm.conf.j2
index f9332b0e633cae26395306ce7d2d218710c64e1c..f8818eca480935c56a5974c7241d5f66f0d99155 100644
--- a/roles/calculateSlurmConf/templates/slurm.conf.j2
+++ b/roles/calculateSlurmConf/templates/slurm.conf.j2
@@ -10,6 +10,9 @@
 #
 ClusterName={{ clustername }}
 ControlMachine={{ slurmctrl }}
+{% if slurmctrlbackup is defined %}
+BackupController={{ slurmctrlbackup }}
+{% endif %}
 #ControlAddr=
 #BackupController=
 #BackupAddr=
@@ -121,7 +124,10 @@ Epilog={{ slurmjob.epilog }}
 #JobAcctGatherFrequency=30
 #
 AccountingStorageType=accounting_storage/slurmdbd
-AccountingStorageHost={{ slurmctrl }}
+AccountingStorageHost={{ slurmdbd }}
+{% if slurmdbdbackup is defined %}
+AccountingStorageBackupHost={{ slurmdbdbackup }}
+{% endif %}
 #AccountingStorageEnforce=limits,safe
 #AccountingStorageLoc=
 #AccountingStoragePass=
diff --git a/roles/slurmdb-config/templates/slurmdbd.conf.j2 b/roles/calculateSlurmConf/templates/slurmdbd.conf.j2
similarity index 85%
rename from roles/slurmdb-config/templates/slurmdbd.conf.j2
rename to roles/calculateSlurmConf/templates/slurmdbd.conf.j2
index 5a6cd9aed308aa8982c173a2c8d9fc3db82d90f5..dc471330d5cdf3368efac17a85ba168e1ed4eab2 100644
--- a/roles/slurmdb-config/templates/slurmdbd.conf.j2
+++ b/roles/calculateSlurmConf/templates/slurmdbd.conf.j2
@@ -17,7 +17,10 @@ AuthType=auth/munge
 #
 # slurmDBD info
 #DbdAddr=
-DbdHost={{ slurmctrl }}
+DbdHost={{ slurmdbd }}
+{% if slurmdbdbackup is defined %}
+DbdBackupHost={{ slurmdbdbackup }}
+{% endif %}
 #DbdPort=7031
 SlurmUser=slurm
 #MessageTimeout=300
@@ -36,7 +39,7 @@ PidFile=/var/run/slurmdbd.pid
 #
 # Database info
 StorageType=accounting_storage/mysql
-StorageHost=localhost
+StorageHost={{ mysql_host }}
 #StoragePort=1234
 StoragePass={{ slurmdb_passwd }}
 StorageUser=slurmdb