diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index f6604a7..422adc9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,12 +1,15 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
 - system.salt.master.api
-- system.reclass.storage.salt
 - system.salt.minion.cert.k8s_server
+- system.mysql.client
+- system.mysql.client.database.grafana
+- system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
 - cluster.virtual-mcp11-k8s-contrail.infra
@@ -20,6 +23,7 @@
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
     salt_master_host: ${_param:infra_config_deploy_address}
+    openstack_version: pike
   linux:
     network:
       interface:
@@ -169,4 +173,4 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:kubernetes_compute_node02_address}
\ No newline at end of file
+            single_address: ${_param:kubernetes_compute_node02_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 6594f9c..b5a73b2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -3,11 +3,16 @@
 - system.linux.system.single.debian
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.server.team.all
 - system.rsyslog.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
 - system.telegraf.agent
 - system.prometheus.collector
 - service.grafana.collector
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 52af70d..adfdfff 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -1,6 +1,8 @@
 
 parameters:
   _param:
+    openstack_version: pike
+
     salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
 
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 35cead0..d3dde42 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -18,6 +18,7 @@
 - cluster.virtual-mcp11-k8s-contrail.infra
 parameters:
   _param:
+    openstack_version: mitaka
     keepalived_vip_interface: eth1
     cluster_vip_address: ${_param:opencontrail_control_address}
     cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index fbdcd1f..6d10dd1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -1,5 +1,7 @@
 parameters:
   _param:
+    openstack_version: pike
+
     stacklight_monitor_address: 172.16.10.251
     stacklight_node01_hostname: mon01
     stacklight_node02_hostname: mon02
@@ -9,6 +11,7 @@
     stacklight_node03_address: 172.16.10.109
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
 
     mysql_admin_user: root
     mysql_admin_password: workshop
@@ -24,9 +27,9 @@
     galera_xtrabackup_parallel: 1
     galera_error_log_enabled: true
 
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index ef53609..603d3c7 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -44,7 +44,7 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens4
     # Galera
-    openstack_version: newton
+    openstack_version: pike
     galera_innodb_buffer_pool_size: 1024M
     galera_max_connections: 200
     # Grafana