diff --git a/defaults/backup.yml b/defaults/backup.yml
index 1cff51b..8b54a2b 100644
--- a/defaults/backup.yml
+++ b/defaults/backup.yml
@@ -5,6 +5,6 @@
     backup_day_of_month: "*"
     backup_month: "*"
     backup_day_of_week: "*"
-    zookeeper_remote_backup_server: cfg01
-    cassandra_remote_backup_server: cfg01
+    zookeeper_remote_backup_server: ${_param:infra_config_hostname}
+    cassandra_remote_backup_server: ${_param:infra_config_hostname}
     xtrabackup_client_throttle: 0 # disabled
diff --git a/defaults/init.yml b/defaults/init.yml
index 0094ec3..e1dc984 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -53,7 +53,7 @@
     salt_control_trusty_image_backend: /var/lib/libvirt/images/backends/trusty.qcow2
     salt_master_api_port: 6969
     salt_master_worker_threads: 40
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
     # Make sure this global variable is defined everywhere, where used it is already set on cluster level
     cluster_public_host: '127.0.0.1'
     single_address: '127.0.0.1'