diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index 336a9d2..cac737a 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -119,54 +119,67 @@
               value_template: <<node_tenant_ip>>
             external_address:
               value_template: <<node_external_ip>>
-        openstack_gateway:
-          expression: <<node_hostname>>__startswith__gtw
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.openstack.gateway
-          node_param:
-            tenant_address:
-              value_template: <<node_tenant_ip>>
-            external_address:
-              value_template: <<node_external_ip>>
-          cluster_param:
-            openstack_gateway_node01_address:
-              value_template: <<node_control_ip>>
-        stacklight_monitor01:
+        stacklight_monitor_node01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
-            stacklight_monitor_node01_address:
+            stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        stacklight_monitor02:
+        stacklight_monitor_node02:
           expression: <<node_hostname>>__equals__mon02
           cluster_param:
-            stacklight_monitor_node02_address:
+            stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        stacklight_monitor03:
+        stacklight_monitor_node03:
           expression: <<node_hostname>>__equals__mon03
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-      node:
-        openstack_control_node01:
+        prx_node:
+          name: ${_param:openstack_proxy_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.stacklight.proxy
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:openstack_proxy_node01_address}
+        stacklight_monitor_node01:
+          name: ${_param:stacklight_monitor_node01_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.master.cluster
+          - system.docker.swarm.master
+          - cluster.${_param:cluster_name}.stacklight.client
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:stacklight_monitor_node01_address}
+            keepalived_vip_priority: 100
             mysql_cluster_role: master
-            linux_system_codename: xenial
-        openstack_control_node02:
+        stacklight_monitor_node02:
+          name: ${_param:stacklight_monitor_node02_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
-            mysql_cluster_role: slave
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-        openstack_control_node03:
+            single_address: ${_param:stacklight_monitor_node02_address}
+            keepalived_vip_priority: 101
+            mysql_cluster_role: slave
+        stacklight_monitor_node03:
+          name: ${_param:stacklight_monitor_node03_hostname}
+          domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
+          - system.docker.swarm.manager
+          - cluster.${_param:cluster_name}.stacklight.server
           params:
-            mysql_cluster_role: slave
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
+            single_address: ${_param:stacklight_monitor_node03_address}
+            keepalived_vip_priority: 102
+            mysql_cluster_role: slave
diff --git a/classes/cluster/sl_os_ovs/openstack/init.yml b/classes/cluster/sl_os_ovs/openstack/init.yml
index 8b7f3c9..aba9cee 100644
--- a/classes/cluster/sl_os_ovs/openstack/init.yml
+++ b/classes/cluster/sl_os_ovs/openstack/init.yml
@@ -88,6 +88,9 @@
     keystone_keystone_password: workshop
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
+    keystone_aodh_password: workshop
+    keystone_designate_password: workshop
+    keystone_ceilometer_password: workshop
     metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
@@ -98,6 +101,8 @@
     aodh_service_host: ${_param:cluster_vip_address}
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: ${_param:cluster_vip_address}
+    designate_version: ${_param:openstack_version}
+    designate_service_host: ${_param:cluster_vip_address}
   linux:
     network:
       host: