diff --git a/horizon/server/plugin/api_mask.yml b/horizon/server/plugin/api_mask.yml
new file mode 100644
index 0000000..bf7168f
--- /dev/null
+++ b/horizon/server/plugin/api_mask.yml
@@ -0,0 +1,10 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        api_mask:
+          app: api_mask
+          mask_url: "${_param:horizon_api_mask}"
+          source:
+            engine: pkg
+            name: openstack-dashboard-api-mask
diff --git a/horizon/server/plugin/billing.yml b/horizon/server/plugin/billing.yml
new file mode 100644
index 0000000..486070b
--- /dev/null
+++ b/horizon/server/plugin/billing.yml
@@ -0,0 +1,18 @@
+parameters:
+  _param:
+    openstack_billing_currency: EUR
+  horizon:
+    server:
+      plugin:
+        billing:
+          metric:
+            engine: graphite
+            host: ${_param:openstack_billing_address}
+            port: 80
+          config:
+            currency: ${_param:openstack_billing_currency}
+            allocation: false
+            extra_resource_types: []
+          source:
+            engine: pkg
+            name: openstack-dashboard-billing
diff --git a/horizon/server/plugin/contrail.yml b/horizon/server/plugin/contrail.yml
new file mode 100644
index 0000000..9fb8e26
--- /dev/null
+++ b/horizon/server/plugin/contrail.yml
@@ -0,0 +1,8 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        contrail:
+          source:
+            engine: pkg
+            name: openstack-dashboard-contrail-panels
diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
new file mode 100644
index 0000000..86b9956
--- /dev/null
+++ b/horizon/server/plugin/heat.yml
@@ -0,0 +1,8 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        heat:
+          source:
+            engine: pkg
+            name: openstack-dashboard-heat-server-templates
diff --git a/horizon/server/plugin/jenkins.yml b/horizon/server/plugin/jenkins.yml
new file mode 100644
index 0000000..f1a18c7
--- /dev/null
+++ b/horizon/server/plugin/jenkins.yml
@@ -0,0 +1,8 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        jenkins:
+          source:
+            engine: pkg
+            name: openstack-dashboard-jenkins
diff --git a/horizon/server/plugin/monitoring.yml b/horizon/server/plugin/monitoring.yml
new file mode 100644
index 0000000..66add94
--- /dev/null
+++ b/horizon/server/plugin/monitoring.yml
@@ -0,0 +1,9 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        monitoring:
+          app: horizon_monitoring          
+          source:
+            engine: pkg
+            name: openstack-dashboard-sensu
diff --git a/horizon/server/plugin/telemetry.yml b/horizon/server/plugin/telemetry.yml
new file mode 100644
index 0000000..3c414b5
--- /dev/null
+++ b/horizon/server/plugin/telemetry.yml
@@ -0,0 +1,12 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        telemetry:
+          metric:
+            engine: graphite
+            host: ${_param:openstack_telemetry_address}
+            port: 80
+          source:
+            engine: pkg
+            name: openstack-dashboard-telemetry
\ No newline at end of file
diff --git a/horizon/server/plugin/theme.yml b/horizon/server/plugin/theme.yml
new file mode 100644
index 0000000..97dd1c8
--- /dev/null
+++ b/horizon/server/plugin/theme.yml
@@ -0,0 +1,12 @@
+parameters:
+  _param:
+    horizon_dashboard_theme: mirantis
+  horizon:
+    server:
+      plugin:
+        horizon_theme:
+          app: horizon_theme
+          theme_name: ${_param:horizon_dashboard_theme}
+          source:
+            engine: pkg
+            name: openstack-dashboard-.${_param:horizon_dashboard_theme}
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index e745f56..e69de29 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -1,28 +0,0 @@
-classes:
-- service.horizon.server.single
-parameters:
-  horizon:
-    server:
-      branding: "OpenStack Dashboard"
-      bind:
-        address: 0.0.0.0
-        port: 8078
-      plugin:
-        contrail:
-          source:
-            engine: pkg
-            name: openstack-dashboard-contrail-panels
-        horizon_overrides:
-          override: true
-          overrides:
-            - contrail_openstack_dashboard
-          app: horizon_overrides
-          source:
-            engine: pkg
-            name: python-horizon-overrides-plugin
-        horizon_theme:
-          app: horizon_theme
-          theme_name: mirantis-theme
-          source:
-            engine: pkg
-            name: openstack-dashboard-mirantis-theme
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index 606b410..d16d4e5 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -20,7 +20,6 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:fuel_compute_node02_address}
-            deploy_address: 192.168.10.152
         fuel_compute_node03:
           name: kvm03
           domain: ${_param:cluster_domain}