diff --git a/.gitmodules b/.gitmodules
index 014c0c1..089f541 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "classes/system"]
 	path = classes/system
-	url = https://gerrit.mcp.mirantis.net/salt-models/reclass-system
+	url = https://github.com/Mirantis/reclass-system-salt-model.git
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
index 6b10371..2a1b67d 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
@@ -27,6 +27,7 @@
     cluster_node03_address: ${_param:opencontrail_control_node03_address}
     opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
     opencontrail_router01_address: 172.16.10.131
+    opencontrail_control_interface_name: eth1
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index a115aac..cc8ad62 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -46,7 +46,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
-    keepalived_openstack_telemetry_vip_address: 172.16.10.252
+    keepalived_openstack_telemetry_vip_address: 172.16.10.251
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 2887191..8869a18 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -45,7 +45,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
-    keepalived_openstack_telemetry_vip_address: 172.16.10.252
+    keepalived_openstack_telemetry_vip_address: 172.16.10.251
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
diff --git a/classes/system b/classes/system
index 3640e0b..1b471d8 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 3640e0bb0ce26b0ab9a00bd6777a6cd34e43fb0f
+Subproject commit 1b471d810cc0a110d9720efb7d1a55c1e0bfd8dc