diff --git a/classes/cluster/os-ha-contrail-40/.env b/classes/cluster/os-ha-contrail-40/.env
index 89b7f61..83ae21f 100644
--- a/classes/cluster/os-ha-contrail-40/.env
+++ b/classes/cluster/os-ha-contrail-40/.env
@@ -1,4 +1,4 @@
 EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
         grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
         elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
-        gerrit artifactory influxdb horizon nginx collectd heka mysql nova"
+        gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
diff --git a/classes/cluster/os-ha-contrail/.env b/classes/cluster/os-ha-contrail/.env
index 89b7f61..83ae21f 100644
--- a/classes/cluster/os-ha-contrail/.env
+++ b/classes/cluster/os-ha-contrail/.env
@@ -1,4 +1,4 @@
 EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
         grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
         elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
-        gerrit artifactory influxdb horizon nginx collectd heka mysql nova"
+        gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
diff --git a/classes/cluster/os-ha-ovs-syndic/.env b/classes/cluster/os-ha-ovs-syndic/.env
new file mode 100644
index 0000000..b8847b6
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-syndic/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="nginx"
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 0b4ed38..5729943 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -4,7 +4,6 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- system.horizon.server.plugin.theme
 - cluster.virtual-mcp11-dvr
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/.env b/classes/cluster/virtual-mcp11-k8s-contrail/.env
new file mode 100644
index 0000000..e5922db
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="heka"
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index faeb96f..a9cbd60 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -4,7 +4,6 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- system.horizon.server.plugin.theme
 - cluster.virtual-mcp11-ovs
 parameters:
   _param:
diff --git a/classes/system b/classes/system
index 4648fd5..1ddaca1 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 4648fd5808962af295497d0fa9b41bfdf9f5e25f
+Subproject commit 1ddaca160ad1b181562cbe2592ec55974024d46c