diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index b774ff8..174d408 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: sl-os-ovs.local
     cluster_name: sl-os-ovs
+    infra_config_hostname: cfg01
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.100
   linux:
@@ -10,8 +11,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/init.yml b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
@@ -5,8 +5,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
index 1af77a3..1fdd09c 100644
--- a/classes/cluster/virtual-mcp05-dvr/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -14,6 +14,7 @@
     cluster_domain: virtual-mcp05-dvr.local
     cluster_name: virtual-mcp05-dvr
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     # openstack service addresses
     openstack_database_address: 172.16.10.254
@@ -39,4 +40,4 @@
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+    stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/init.yml b/classes/cluster/virtual-mcp10-ovs/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/init.yml
@@ -5,8 +5,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/virtual-mcp10-ovs/init.yml b/classes/cluster/virtual-mcp10-ovs/init.yml
index af37ef4..518a42b 100644
--- a/classes/cluster/virtual-mcp10-ovs/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/init.yml
@@ -14,6 +14,7 @@
     cluster_domain: virtual-mcp10-ovs.local
     cluster_name: virtual-mcp10-ovs
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     # openstack service addresses
     openstack_proxy_address: 172.16.10.121
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/init.yml
index 9140bd0..b01723d 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/init.yml
@@ -5,8 +5,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
index 9b0ff88..fc97787 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
@@ -14,7 +14,7 @@
   _param:
     cluster_domain: virtual-mcp11-contrail-nfv.local
     cluster_name: virtual-mcp11-contrail-nfv
-
+    infra_config_hostname: cfg01
     # infra service addresses
     infra_config_address: 172.16.10.100
 
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
index 01a9a5d..96d212b 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
@@ -8,8 +8,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index a9ccc70..8bc1323 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -15,6 +15,7 @@
     cluster_domain: virtual-mcp11-ovs-ironic.local
     cluster_name: virtual-mcp11-ovs-ironic
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.90
     # openstack service addresses
     openstack_proxy_address: 172.16.10.121
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/init.yml b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
index be51f48..af6f300 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: virtual-mcp11-ovs.local
     cluster_name: virtual-mcp11-ovs
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
   linux:
     network:
@@ -9,8 +10,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names: