diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index b5b7dac..43ffbfa 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -148,7 +148,7 @@
           name: ${_param:cicd_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.cicd.control.master
+          - cluster.${_param:cluster_name}.cicd.control.leader
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
@@ -203,4 +203,13 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp-ocata-cicd.openstack.proxy
+          params:
+            linux_system_codename: xenial
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index f6d4e51..ae64ce7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -176,4 +176,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 5408c99..1d20b62 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -177,4 +177,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index 547be16..185739a 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -170,4 +170,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
index ef2de42..5e9068d 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -15,6 +15,9 @@
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
 - cluster.virtual-mcp05-ovs.openstack.proxy
 - cluster.virtual-mcp05-ovs.stacklight.proxy
 - cluster.virtual-mcp05-ovs
@@ -167,4 +170,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 1b7a1c4..c86ed5b 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -15,7 +15,6 @@
 - system.keystone.client.service.nova21
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.opencontrail_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.openstack_proxy_single
@@ -163,3 +162,6 @@
           classes:
           - system.influxdb.server.single
           - system.influxdb.database.stacklight
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp10-contrail.openstack.proxy
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index a37ca83..d6bd4a2 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -17,7 +17,7 @@
 - system.reclass.storage.system.stacklight_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
 - cluster.virtual-mcp10-dvr.openstack.proxy
 - cluster.virtual-mcp10-dvr.stacklight.proxy
 - cluster.virtual-mcp10-dvr
@@ -170,4 +170,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index 36514b4..ab944e7 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -17,7 +17,7 @@
 - system.reclass.storage.system.stacklight_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
 - cluster.virtual-mcp10-ovs.openstack.proxy
 - cluster.virtual-mcp10-ovs.stacklight.proxy
 - cluster.virtual-mcp10-ovs
@@ -171,3 +171,7 @@
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index ec1d55b..b5f75de 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -183,4 +183,7 @@
         openstack_compute_node02:
           params:
             compute_vrouter_dpdk_mac_address: 02:de:aa:e6:12:81 #must be manually changed to mac of ens4
-            compute_vrouter_dpdk_pci: "'0000:00:04.0'"
\ No newline at end of file
+            compute_vrouter_dpdk_pci: "'0000:00:04.0'"
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp11-contrail-nfv.openstack.proxy
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index ff26926..d73aba5 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -176,3 +176,6 @@
           classes:
           - system.influxdb.server.single
           - system.influxdb.database.stacklight
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp11-contrail.openstack.proxy
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index aa13233..a6012f6 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -21,7 +21,7 @@
 - system.reclass.storage.system.stacklightv2_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
 - cluster.virtual-mcp11-dvr.openstack.proxy
 - cluster.virtual-mcp11-dvr.stacklight.proxy
 - cluster.virtual-mcp11-dvr
@@ -174,4 +174,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index 43b744b..e1f711e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -133,4 +133,22 @@
             linux_system_codename: xenial
             single_address: ${_param:stacklight_node03_address}
             keepalived_vip_priority: 102
-            mysql_cluster_role: slave
\ No newline at end of file
+            mysql_cluster_role: slave
+        kubernetes_compute_node01:
+          name: ${_param:kubernetes_compute_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.kubernetes.compute
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:kubernetes_compute_node01_address}
+        kubernetes_compute_node02:
+          name: ${_param:kubernetes_compute_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.kubernetes.compute
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:kubernetes_compute_node02_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 4dcefe5..22ba7e3 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -151,3 +151,21 @@
         opencontrail_control_node03:
           params:
             rabbitmq_cluster_role: slave
+        kubernetes_compute_node01:
+          name: ${_param:kubernetes_compute_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.kubernetes.compute
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:kubernetes_compute_node01_address}
+        kubernetes_compute_node02:
+          name: ${_param:kubernetes_compute_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.kubernetes.compute
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:kubernetes_compute_node02_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 2dd4467..2dc28ae 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -21,7 +21,7 @@
 - system.reclass.storage.system.stacklight_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
 - cluster.virtual-mcp11-ovs-dpdk.openstack.proxy
 - cluster.virtual-mcp11-ovs-dpdk.stacklight.proxy
 - cluster.virtual-mcp11-ovs-dpdk
@@ -179,3 +179,7 @@
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index 37c3b32..09d4de3 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -137,13 +137,6 @@
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
-        openstack_baremetal_node01:
-          params:
-            single_baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
-            keepalived_openstack_baremetal_vip_priority: 100
-            ironic_api_type: 'deploy'
-            tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
         openstack_compute_node01:
           params:
             single_address: 172.16.10.105
@@ -153,4 +146,20 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp11-ovs-ironic.openstack.proxy
+          params:
+            linux_system_codename: xenial
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+        openstack_baremetal_node01:
+          params:
+            single_baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
+            keepalived_openstack_baremetal_vip_priority: 100
+            ironic_api_type: 'deploy'
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 9d90cb3..26cbbf7 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -20,7 +20,7 @@
 - system.reclass.storage.system.stacklight_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
 - cluster.virtual-mcp11-ovs.openstack.proxy
 - cluster.virtual-mcp11-ovs.stacklight.proxy
 - cluster.virtual-mcp11-ovs
@@ -173,4 +173,8 @@
           params:
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
\ No newline at end of file
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
\ No newline at end of file