diff --git a/classes/cluster/os_ha_contrail/infra/config.yml b/classes/cluster/os_ha_contrail/infra/config.yml
index fb26bc0..0277722 100755
--- a/classes/cluster/os_ha_contrail/infra/config.yml
+++ b/classes/cluster/os_ha_contrail/infra/config.yml
@@ -25,7 +25,6 @@
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
 - cluster.os_ha_contrail.openstack.proxy
-- cluster.os_ha_contrail.openstack.dashboard
 - cluster.os_ha_contrail
 parameters:
   _param:
@@ -51,7 +50,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: prx
+            host: ${_param:openstack_control_address}
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -124,18 +123,21 @@
         openstack_control_node01:
           classes:
           - service.galera.master.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: master
             linux_system_codename: xenial
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
         openstack_control_node03:
           classes:
           - service.galera.slave.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
diff --git a/classes/cluster/os_ha_contrail/openstack/dashboard.yml b/classes/cluster/os_ha_contrail/openstack/dashboard.yml
index 7c9602e..0c4cb38 100755
--- a/classes/cluster/os_ha_contrail/openstack/dashboard.yml
+++ b/classes/cluster/os_ha_contrail/openstack/dashboard.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.horizon.server.single
+- system.horizon.server.cluster
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
 - cluster.os_ha_contrail
diff --git a/classes/cluster/os_ha_contrail/openstack/init.yml b/classes/cluster/os_ha_contrail/openstack/init.yml
index 97a3fcf..826c807 100755
--- a/classes/cluster/os_ha_contrail/openstack/init.yml
+++ b/classes/cluster/os_ha_contrail/openstack/init.yml
@@ -1,8 +1,9 @@
 parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_node01_address: ${_param:infra_config_address}
 
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
@@ -37,7 +38,7 @@
     apt_mk_version: nightly
     openstack_region: RegionOne
     admin_email: root@localhost
-    cluster_public_host: ${_param:openstack_control_address}
+    cluster_public_host: ${_param:openstack_proxy_address}
     opencontrail_version: 3.0
     opencontrail_compute_dns: 8.8.8.8
     opencontrail_stats_password: contrail123