diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
index d865179..86abeef 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
@@ -36,6 +36,10 @@
     kubernetes_control_node03_address: 172.16.10.103
     kubernetes_proxy_node01_hostname: prx01
     kubernetes_proxy_node01_address: 172.16.10.121
+    etcd_control_node01_address: ${_param:kubernetes_control_node01_address}
+    etcd_control_node02_address: ${_param:kubernetes_control_node02_address}
+    etcd_control_node03_address: ${_param:kubernetes_control_node03_address}
+
 
     cluster_vip_address: ${_param:kubernetes_control_address}
     cluster_local_address: ${_param:single_address}
diff --git a/classes/system b/classes/system
index c5df34a..3640e0b 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c5df34ae453d53274d570ab0a0e91ed7c43f22c5
+Subproject commit 3640e0bb0ce26b0ab9a00bd6777a6cd34e43fb0f