diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index ab8467f..09a3d58 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -37,8 +37,6 @@
     pool:
       network:
         engine: opencontrail
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index 8f89385..a27712e 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -41,8 +41,7 @@
           enabled: true
       network:
         engine: opencontrail
-        public_ip_range: 185.22.97.128/26
-        public_network: default-domain:default-project:Public
-        private_ip_range: 10.150.0.0/16
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
+        contrail:
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 57faff7..213ee65 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -39,11 +39,11 @@
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         engine: opencontrail
-        config:
-          api:
-            host: ${_param:opencontrail_control_address}
-        contrail_cni:
-          image: ${_param:kubernetes_opencontrail_cni_image}
+        contrail:
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}
+          cni_image: ${_param:kubernetes_opencontrail_cni_image}
     common:
       addons:
         virtlet:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 098b933..de7acdc 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -59,9 +59,10 @@
           enabled: true
       network:
         engine: opencontrail
-        public_ip_range: 185.22.97.128/26
-        public_network: default-domain:default-project:Public
-        private_ip_range: 10.150.0.0/16
-        config:
-          api:
-            host: ${_param:opencontrail_control_address}
+        contrail:
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index 5fafd8e..d13f132 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -33,8 +33,6 @@
     pool:
       network:
         engine: opencontrail
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index ba70eae..f1ee23b 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -40,8 +40,7 @@
           enabled: true
       network:
         engine: opencontrail
-        public_ip_range: 185.22.97.128/26
-        public_network: default-domain:default-project:Public
-        private_ip_range: 10.150.0.0/16
-        opencontrail:
-          address: ${_param:opencontrail_control_address}
+        contrail:
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 11fd26c..f1b3f79 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -37,11 +37,11 @@
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         engine: opencontrail
-        config:
-          api:
-            host: ${_param:opencontrail_control_address}
-        contrail_cni:
-          image: ${_param:kubernetes_opencontrail_cni_image}
+        contrail:
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}
+          cni_image: ${_param:kubernetes_opencontrail_cni_image}
     common:
       addons:
         virtlet:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 364879f..e1198a6 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -51,9 +51,10 @@
           enabled: ${_param:kubernetes_netchecker_enabled}
       network:
         engine: opencontrail
-        public_ip_range: 185.22.97.128/26
-        public_network: default-domain:default-project:Public
-        private_ip_range: 10.150.0.0/16
-        config:
-          api:
-            host: ${_param:opencontrail_control_address}
+        contrail:
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}