diff --git a/horizon/server/app/tcpcloud_kilo.yml b/horizon/server/app/tcpcloud_kilo.yml
deleted file mode 100644
index 9c7422d..0000000
--- a/horizon/server/app/tcpcloud_kilo.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-parameters:
-  _param:
-    nginx_site_horizon_tcpcloud_kilo_host: _
-    horizon_tcpcloud_kilo_secret_key: workshop
-  nginx:
-    server:
-      site:
-        horizon_tcpcloud_kilo:
-          enabled: true
-          type: horizon
-          name: tcpcloud_kilo
-          host:
-            name: _
-  supervisor:
-    server:
-      service:
-        horizon_tcpcloud_kilo:
-          type: horizon
-          name: tcpcloud_kilo
-  horizon:
-    server:
-      app:
-        tcpcloud_kilo:
-          version: kilo
-          branding: "Mk20 Lab Dashboard"
-          bind:
-            address: 0.0.0.0
-            port: 8078
-          secret_key: ${_param:horizon_tcpcloud_kilo_secret_key}
-          source:
-            engine: git
-            address: git@git.tcpcloud.eu:python-apps/horizon.git
-            revision: stable/kilo
-          cache:
-            engine: 'memcached'
-            host: '127.0.0.1'
-            port: 11211
-            prefix: 'CACHE_TCPCLOUD_KILO'
-          identity:
-            engine: keystone
-            host: ${_param:cluster_vip_address}
-            encryption: none
-            port: 5000
-            api_version: 3
-          api_versions:
-            identity: 3
-          plugin:
-            horizon_overrides:
-              app: horizon_overrides
-              override: true
-              overrides:
-              - contrail_openstack_dashboard
-              source:
-                engine: git
-                address: git@git.tcpcloud.eu:horizon-modules/horizon-overrides-plugin.git
-                revision: develop
-            contrail:
-              app: contrail_openstack_dashboard
-              source:
-                engine: git
-                address: git@git.tcpcloud.eu:horizon-modules/horizon-contrail-panels.git
-                revision: stable/kilo
-            horizon_theme:
-              app: horizon_theme
-              theme_name: tcp
-              source:
-                engine: git
-                address: git@git.tcpcloud.eu:horizon-themes/horizon-tcp-theme.git
-                revision: stable/kilo
-          mail:
-            engine: console
diff --git a/horizon/server/plugin/api_mask.yml b/horizon/server/plugin/api_mask.yml
index bf7168f..5ef5f5a 100644
--- a/horizon/server/plugin/api_mask.yml
+++ b/horizon/server/plugin/api_mask.yml
@@ -4,7 +4,7 @@
       plugin:
         api_mask:
           app: api_mask
-          mask_url: "${_param:horizon_api_mask}"
+          mask_url: ${_param:horizon_api_mask_url}
           source:
             engine: pkg
             name: openstack-dashboard-api-mask
diff --git a/horizon/server/plugin/billing.yml b/horizon/server/plugin/billing.yml
index 486070b..9fdefde 100644
--- a/horizon/server/plugin/billing.yml
+++ b/horizon/server/plugin/billing.yml
@@ -1,6 +1,8 @@
 parameters:
   _param:
     openstack_billing_currency: EUR
+    openstack_billing_allocation: False
+    openstack_billing_resource_types: []
   horizon:
     server:
       plugin:
@@ -11,8 +13,11 @@
             port: 80
           config:
             currency: ${_param:openstack_billing_currency}
-            allocation: false
-            extra_resource_types: []
+            allocation: ${_param:openstack_billing_allocation}
+            extra_resource_types: ${_param:openstack_billing_resource_types}
           source:
             engine: pkg
             name: openstack-dashboard-billing
+        horizon_overrides:
+          overrides:
+          - horizon_billing
diff --git a/horizon/server/plugin/contrail.yml b/horizon/server/plugin/contrail.yml
index 9fb8e26..669dbb6 100644
--- a/horizon/server/plugin/contrail.yml
+++ b/horizon/server/plugin/contrail.yml
@@ -6,3 +6,6 @@
           source:
             engine: pkg
             name: openstack-dashboard-contrail-panels
+        horizon_overrides:
+          overrides:
+          - contrail_openstack_dashboard
diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
index 86b9956..9e70480 100644
--- a/horizon/server/plugin/heat.yml
+++ b/horizon/server/plugin/heat.yml
@@ -6,3 +6,6 @@
           source:
             engine: pkg
             name: openstack-dashboard-heat-server-templates
+        horizon_overrides:
+          overrides:
+          - heat_server_templates
diff --git a/horizon/server/plugin/jenkins.yml b/horizon/server/plugin/jenkins.yml
index f1a18c7..04c4901 100644
--- a/horizon/server/plugin/jenkins.yml
+++ b/horizon/server/plugin/jenkins.yml
@@ -1,6 +1,13 @@
 parameters:
+  _param:
+    horizon_jenkins_url: http://localhost:8080/
+    horizon_jenkins_user: admin
   horizon:
     server:
+      jenkins_api:
+        url: ${_param:horizon_jenkins_url}
+        user: ${_param:horizon_jenkins_user}
+        password: ${_param:horizon_jenkins_password}
       plugin:
         jenkins:
           source:
diff --git a/horizon/server/plugin/overrides.yml b/horizon/server/plugin/overrides.yml
new file mode 100644
index 0000000..edf60b3
--- /dev/null
+++ b/horizon/server/plugin/overrides.yml
@@ -0,0 +1,10 @@
+parameters:
+  horizon:
+    server:
+      plugin:
+        horizon_overrides:
+          override: true
+          app: horizon_overrides
+          source:
+            engine: pkg
+            name: python-horizon-overrides-plugin
diff --git a/horizon/server/plugin/telemetry.yml b/horizon/server/plugin/telemetry.yml
index 3c414b5..a944111 100644
--- a/horizon/server/plugin/telemetry.yml
+++ b/horizon/server/plugin/telemetry.yml
@@ -1,12 +1,21 @@
 parameters:
+  _param:
+    horizon_telemetry_engine: graphite
+    horizon_telemetry_host: 127.0.0.1
+    horizon_telemetry_port: 80
+    horizon_telemetry_control_nodes: {}
   horizon:
     server:
+      control_nodes: ${_param:horizon_telemetry_control_nodes}
       plugin:
         telemetry:
           metric:
-            engine: graphite
-            host: ${_param:openstack_telemetry_address}
-            port: 80
+            engine: ${_param:horizon_telemetry_engine}
+            host: ${_param:horizon_telemetry_host}
+            port: ${_param:horizon_telemetry_port}
           source:
             engine: pkg
-            name: openstack-dashboard-telemetry
\ No newline at end of file
+            name: openstack-dashboard-telemetry
+        horizon_overrides:
+          overrides:
+          - horizon_telemetry
diff --git a/horizon/server/plugin/theme.yml b/horizon/server/plugin/theme.yml
index 97dd1c8..85475d7 100644
--- a/horizon/server/plugin/theme.yml
+++ b/horizon/server/plugin/theme.yml
@@ -9,4 +9,4 @@
           theme_name: ${_param:horizon_dashboard_theme}
           source:
             engine: pkg
-            name: openstack-dashboard-.${_param:horizon_dashboard_theme}
+            name: openstack-dashboard-${_param:horizon_dashboard_theme}-theme