diff --git a/classes/cluster/os_ha_contrail/infra/config.yml b/classes/cluster/os_ha_contrail/infra/config.yml
index 2e3076c..16d7f32 100755
--- a/classes/cluster/os_ha_contrail/infra/config.yml
+++ b/classes/cluster/os_ha_contrail/infra/config.yml
@@ -26,8 +26,8 @@
   _param:
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master
-    reclass_config_master: 192.168.10.100
-    single_address: 172.16.10.100
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -61,7 +61,7 @@
           expression: all
           node_param:
             single_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
             linux_system_codename:
               value_template: <<node_os>>
             salt_master_host:
@@ -70,41 +70,41 @@
           expression: <<node_hostname>>__startswith__cfg
           cluster_param:
             infra_config_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
             infra_config_deploy_address:
-              value_template: <<node_ip>>
+              value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
         openstack_control01:
           expression: <<node_hostname>>__equals__ctl01
           cluster_param:
             openstack_control_node01_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         openstack_control02:
           expression: <<node_hostname>>__equals__ctl02
           cluster_param:
             openstack_control_node02_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         openstack_control03:
           expression: <<node_hostname>>__equals__ctl03
           cluster_param:
             openstack_control_node03_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         opencontrail_control01:
           expression: <<node_hostname>>__equals__ntw01
           cluster_param:
             opencontrail_control_node01_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         opencontrail_control02:
           expression: <<node_hostname>>__equals__ntw02
           cluster_param:
             opencontrail_control_node02_address:
-              value_template: <<node_ip>>
+              value_template: <<node_control_ip>>
         opencontrail_control03:
           expression: <<node_hostname>>__equals__ntw03
           cluster_param:
             opencontrail_control_node03_address:
-              value_template: <<node_ip>>  
+              value_template: <<node_control_ip>>  
         openstack_compute:
           expression: <<node_hostname>>__startswith__cmp
           node_class: