diff --git a/classes/cluster/model-manager/infra/init.yml b/classes/cluster/model-manager/infra/init.yml
index 6b24a1d..2eb79d1 100644
--- a/classes/cluster/model-manager/infra/init.yml
+++ b/classes/cluster/model-manager/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: model-manager.local
     cluster_name: model-manager
+    infra_config_hostname: cfg01
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.100
     cluster_public_host: mm.mcp.mirantis.net
@@ -11,8 +12,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
           - mm.mcp.mirantis.net
         cfg:
           address: ${_param:infra_config_address}
diff --git a/classes/cluster/os-aio-ovs/infra/init.yml b/classes/cluster/os-aio-ovs/infra/init.yml
index d5609e1..32d7bcd 100644
--- a/classes/cluster/os-aio-ovs/infra/init.yml
+++ b/classes/cluster/os-aio-ovs/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: os-aio-ovs.local
     cluster_name: os-aio-ovs
+    infra_config_hostname: cfg01
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
   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/os-ha-ovs-syndic/infra/init.yml b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
index b3dd013..61d2374 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/init.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
@@ -3,6 +3,7 @@
     cluster_domain: os-ha-ovs-syndic.local
     cluster_name: os-ha-ovs-syndic
     infra_config_deploy_address: 192.168.10.90
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.90
     salt_syndic_master_address: 192.168.10.90
   linux:
@@ -11,8 +12,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/os-ha-ovs/infra/init.yml b/classes/cluster/os-ha-ovs/infra/init.yml
index b8555b0..bd30391 100644
--- a/classes/cluster/os-ha-ovs/infra/init.yml
+++ b/classes/cluster/os-ha-ovs/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: os-ha-ovs.local
     cluster_name: os-ha-ovs
+    infra_config_hostname: cfg01
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
   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-mcp-ocata-dvr/infra/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-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-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index c801079..582837d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -20,6 +20,7 @@
     cluster_domain: virtual-mcp-ocata-dvr.local
     cluster_name: virtual-mcp-ocata-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
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-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-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index d2e3d71..aa01aec 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -20,6 +20,7 @@
   _param:
     cluster_domain: virtual-mcp-ocata-ovs.local
     cluster_name: virtual-mcp-ocata-ovs
+    infra_config_hostname: cfg01
     # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/init.yml b/classes/cluster/virtual-mcp05-ovs/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp05-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-mcp05-ovs/init.yml b/classes/cluster/virtual-mcp05-ovs/init.yml
index ead6ba8..0249838 100644
--- a/classes/cluster/virtual-mcp05-ovs/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/init.yml
@@ -14,6 +14,7 @@
     cluster_domain: virtual-mcp05-ovs.local
     cluster_name: virtual-mcp05-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-mcp10-contrail/infra/init.yml b/classes/cluster/virtual-mcp10-contrail/infra/init.yml
index 9140bd0..b01723d 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/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-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
index 5c405d4..236da7a 100755
--- a/classes/cluster/virtual-mcp10-contrail/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -15,6 +15,7 @@
     cluster_name: virtual-mcp10-contrail
 
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
 
     # openstack service addresses
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/init.yml b/classes/cluster/virtual-mcp10-dvr/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp10-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-mcp10-dvr/init.yml b/classes/cluster/virtual-mcp10-dvr/init.yml
index e1a87ce..3e8ebc8 100644
--- a/classes/cluster/virtual-mcp10-dvr/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/init.yml
@@ -14,6 +14,7 @@
     cluster_domain: virtual-mcp10-dvr.local
     cluster_name: virtual-mcp10-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
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-contrail/infra/init.yml
index b6a6cc2..1d6d63b 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: virtual-mcp11-contrail.local
     cluster_name: virtual-mcp11-contrail
+    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:
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/init.yml b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
index f0cfd07..ffec889 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
@@ -2,6 +2,7 @@
   _param:
     cluster_domain: virtual-mcp11-dvr.local
     cluster_name: virtual-mcp11-dvr
+    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:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/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-ovs-dpdk/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
index ef16a9e..481c969 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
@@ -15,6 +15,7 @@
     cluster_domain: virtual-mcp11-ovs-dpdk.local
     cluster_name: virtual-mcp11-ovs-dpdk
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     # openstack service addresses
     openstack_proxy_address: 172.16.10.121