diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index 997b07e..88dcede 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -1,4 +1,6 @@
 classes:
+- system.docker.client
+- system.docker.host
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
 - system.salt.master.pkg
@@ -9,7 +11,8 @@
 - system.mysql.client.database.grafana
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.sl_k8s_calico.infra
+- cluster.sl_k8s_calico.stacklight.proxy
+- cluster.sl_k8s_calico
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -19,39 +22,76 @@
     single_address: ${_param:infra_config_address}
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
-    salt_master_host: ${_param:infra_config_deploy_address}
+    salt_master_host: 127.0.0.1
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
   reclass:
     storage:
+      class_mapping:
+        common_node:
+          expression: all
+          node_param:
+            single_address:
+              value_template: <<node_control_ip>>
+            linux_system_codename:
+              value_template: <<node_os>>
+            salt_master_host:
+              value_template: <<node_master_ip>>
+        infra_config:
+          expression: <<node_hostname>>__startswith__cfg
+          cluster_param:
+            infra_config_address:
+              value_template: <<node_control_ip>>
+            infra_config_deploy_address:
+              value_template: <<node_deploy_ip>>
+            cluster_domain:
+              value_template: <<node_domain>>
+        infra_proxy:
+          expression: <<node_hostname>>__startswith__prx
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.stacklight.proxy
+        kubernetes_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            kubernetes_control_node01_address:
+              value_template: <<node_control_ip>>
+        kubernetes_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            kubernetes_control_node02_address:
+              value_template: <<node_control_ip>>
+        kubernetes_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            kubernetes_control_node03_address:
+              value_template: <<node_control_ip>>
+        kubernetes_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.kubernetes.compute
+        stacklight_monitor01:
+          expression: <<node_hostname>>__equals__mon01
+          cluster_param:
+            stacklight_monitor_node01_address:
+              value_template: <<node_control_ip>>
+        stacklight_monitor02:
+          expression: <<node_hostname>>__equals__mon02
+          cluster_param:
+            stacklight_monitor_node02_address:
+              value_template: <<node_control_ip>>
+        stacklight_monitor03:
+          expression: <<node_hostname>>__equals__mon03
+          cluster_param:
+            stacklight_monitor_node03_address:
+              value_template: <<node_control_ip>>
       node:
-        kubernetes_compute_node01:
-          name: ${_param:kubernetes_compute_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.kubernetes.compute
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:kubernetes_compute_node01_address}
-        kubernetes_compute_node02:
-          name: ${_param:kubernetes_compute_node02_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.kubernetes.compute
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:kubernetes_compute_node02_address}
-        prx_node:
-          name: ${_param:kubernetes_proxy_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.stacklight.proxy
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:kubernetes_proxy_node01_address}
-        stacklight_node01:
-          name: ${_param:stacklight_node01_hostname}
+        stacklight_monitor_node01:
+          name: ${_param:stacklight_monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.master.cluster
@@ -61,11 +101,11 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_node01_address}
+            single_address: ${_param:stacklight_monitor_node01_address}
             keepalived_vip_priority: 100
             mysql_cluster_role: master
-        stacklight_node02:
-          name: ${_param:stacklight_node02_hostname}
+        stacklight_monitor_node02:
+          name: ${_param:stacklight_monitor_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
@@ -74,11 +114,11 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_node02_address}
+            single_address: ${_param:stacklight_monitor_node02_address}
             keepalived_vip_priority: 101
             mysql_cluster_role: slave
-        stacklight_node03:
-          name: ${_param:stacklight_node03_hostname}
+        stacklight_monitor_node03:
+          name: ${_param:stacklight_monitor_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
@@ -87,6 +127,7 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_node03_address}
+            single_address: ${_param:stacklight_monitor_node03_address}
             keepalived_vip_priority: 102
             mysql_cluster_role: slave
+
diff --git a/classes/cluster/sl_k8s_calico/infra/init.yml b/classes/cluster/sl_k8s_calico/infra/init.yml
index b947c74..5a4b58d 100644
--- a/classes/cluster/sl_k8s_calico/infra/init.yml
+++ b/classes/cluster/sl_k8s_calico/infra/init.yml
@@ -9,14 +9,9 @@
 - system.openssh.server.team.mcp_qa
 - system.openssh.server.team.k8s_team
 - system.rsyslog.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
 - system.telegraf.agent
 - system.prometheus.collector
 - service.grafana.collector
-- cluster.sl_k8s_calico.kubernetes
-- cluster.sl_k8s_calico.stacklight
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses
@@ -24,15 +19,12 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: sl_k8s_calico.local
-    cluster_name: sl_k8s_calico
+    cluster_domain: virtual-mcp11-k8s-calico.local
+    cluster_name: virtual-mcp11-k8s-calico
     apt_mk_version: nightly
+    primary_interface: ens3
   linux:
     network:
-      resolv:
-        dns:
-          - 172.18.176.4
-          - 172.18.208.44
       host:
         cfg01:
           address: ${_param:infra_config_address}
@@ -40,12 +32,14 @@
           - ${_param:infra_config_hostname}
           - ${_param:infra_config_hostname}.${_param:cluster_domain}
       interface:
-        ens4:
+        primary_interface:
           enabled: true
           type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
+          proto: dhcp
+          #proto: static
+          #name: ${_param:primary_interface}
+          #address: ${_param:single_address}
+          #netmask: 255.255.255.0
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
index 1ef30a2..81cb2d7 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
@@ -3,13 +3,17 @@
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.sl_k8s_calico.infra
-- cluster.overrides
+- cluster.sl_k8s_calico
 parameters:
+  _param:
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
   docker:
     host:
       pkgs:
-        - ${_param:kubernetes_docker_package}
+        - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
   kubernetes:
     pool:
@@ -22,7 +26,6 @@
           image: ${_param:kubernetes_calicoctl_image}
         cni:
           image: ${_param:kubernetes_calico_cni_image}
-        mtu: ${_param:kubernetes_mtu}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
@@ -31,15 +34,15 @@
       resolv:
         dns:
           - 10.254.0.10
+          - 172.18.176.4
+          - 172.18.176.7
+        domain: virtual-mcp11-k8s-calico.local
+        options:
+          - ndots:5
+          - timeout:2
+          - attempts:2
       interface:
-        ens4:
-          route:
-            kubernetes_services:
-              address: 10.254.0.0
-              netmask: 255.255.0.0
-              gateway: ${_param:single_address}
-      interface:
-        ens4:
+        primary_interface:
           route:
             kubernetes_services:
               address: 10.254.0.0
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index a0c051a..d743dea 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -5,11 +5,10 @@
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.sl_k8s_calico.kubernetes.compute
-- cluster.sl_k8s_calico.infra
-- cluster.overrides
+- cluster.sl_k8s_calico
 parameters:
   _param:
-    keepalived_vip_interface: ens3
+    keepalived_vip_interface: ${_param:primary_interface}
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
@@ -24,15 +23,10 @@
   kubernetes:
     common:
       addons:
-        helm:
-          enabled: ${_param:kubernetes_helm_enabled}
-        calico_policy:
-          enabled: ${_param:kubernetes_calico_policy_enabled}
-          image: ${_param:kubernetes_calico_policy_image}
         netchecker:
-          enabled: ${_param:kubernetes_netchecker_enabled}
-          agent_image: ${_param:kubernetes_netchecker_agent_image}
-          server_image: ${_param:kubernetes_netchecker_server_image}
+          enabled: true
+        helm:
+          enabled: true
     master:
       etcd:
         ssl:
@@ -43,5 +37,4 @@
             enabled: true
       namespace:
         netchecker:
-          enabled: ${_param:kubernetes_netchecker_enabled}
-
+          enabled: true
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/init.yml b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
index 7b7f819..307ebd0 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
@@ -12,27 +12,8 @@
     kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
-    kubernetes_mtu: 1500
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
-    # docker package version
-    kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
-
-    # component docker images
-    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
-    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
-    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
-
-    # switches of addons
-    kubernetes_helm_enabled: true
-    kubernetes_netchecker_enabled: true
-    kubernetes_calico_policy_enabled: false
-
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
@@ -70,12 +51,6 @@
 
   linux:
     network:
-      resolv:
-        domain: sl_k8s_calico.local
-        options:
-          - ndots:5
-          - timeout:2
-          - attempts:2
       host:
         ctl:
           address: ${_param:kubernetes_control_address}
@@ -113,10 +88,6 @@
           - ${_param:kubernetes_proxy_node01_hostname}
           - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
     system:
-      user:
-        root:
-          name: root
-          password: false
       rc:
         local: |
           #!/bin/sh -e
@@ -128,5 +99,5 @@
           # Make sure that the script will "exit 0" on success or any other
           # value on error.
           #
-          ip r a 10.254.0.0/16 dev ens4
+          ip r a 10.254.0.0/16 dev ens3
           exit 0
diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index 393449c..f27aece 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -1,9 +1,11 @@
 classes:
-- system.docker.client
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- cluster.sl_k8s_calico
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index 243a614..6df9960 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,12 +1,16 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
 parameters:
   _param:
     stacklight_monitor_address: 172.16.10.252
-    stacklight_node01_hostname: mon01
-    stacklight_node02_hostname: mon02
-    stacklight_node03_hostname: mon03
-    stacklight_node01_address: 172.16.10.107
-    stacklight_node02_address: 172.16.10.108
-    stacklight_node03_address: 172.16.10.109
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
 
     # Glusterfs
     glusterfs_service_host: ${_param:stacklight_monitor_address}
@@ -35,20 +39,20 @@
           - mon
           - mon.${_param:cluster_domain}
         mon01:
-          address: ${_param:stacklight_node01_address}
+          address: ${_param:stacklight_monitor_node01_address}
           names:
-          - ${_param:stacklight_node01_hostname}
-          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
         mon02:
-          address: ${_param:stacklight_node02_address}
+          address: ${_param:stacklight_monitor_node02_address}
           names:
-          - ${_param:stacklight_node02_hostname}
-          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
         mon03:
-          address: ${_param:stacklight_node03_address}
+          address: ${_param:stacklight_monitor_node03_address}
           names:
-          - ${_param:stacklight_node03_hostname}
-          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
index 393449c..f2a4469 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
@@ -1,17 +1,18 @@
 classes:
-- system.docker.client
-- system.elasticsearch.client.single
-- system.grafana.client
-- system.grafana.client.datasource.prometheus
-- system.kibana.client.single
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.sl_k8s_calico
 parameters:
   _param:
-    # Elasticsearch/Kibana client parameters
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-    # Grafana client parameters
-    grafana_address: ${_param:stacklight_monitor_address}
-    grafana_port: 15013
-    grafana_user: admin
-    grafana_password: ${_param:grafana_admin_password}
-    grafana_prometheus_address: ${_param:stacklight_monitor_address}
-    grafana_prometheus_port: 15010
+    cluster_public_host: ${_param:prometheus_control_address}
+    nginx_proxy_grafana_port: 15013
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index e83b0d6..7eafd54 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -1,6 +1,8 @@
 classes:
 - system.docker.host
+- system.linux.system.repo.influxdb
 - system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.glusterfs
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
 - system.elasticsearch.server.cluster
@@ -8,6 +10,7 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
@@ -17,8 +20,8 @@
 - system.glusterfs.server.volume.influxdb
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.client
-- system.influxdb.client.database.prometheus
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -26,10 +29,11 @@
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
-- system.docker.swarm.stack.influxdb
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
-- cluster.sl_k8s_calico.infra
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.heka.ceilometer_collector.single
+- cluster.sl_k8s_calico
 parameters:
   _param:
     cluster_vip_address: ${_param:stacklight_monitor_address}
@@ -38,6 +42,7 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_grafana: grafana/grafana:4.3.2
     docker_influxdb_image: influxdb:1.2
@@ -46,12 +51,12 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens4
     # Docker/Elasticsearch
-    cluster_node01_hostname: ${_param:stacklight_node01_hostname}
-    cluster_node01_address: ${_param:stacklight_node01_address}
-    cluster_node02_hostname: ${_param:stacklight_node02_hostname}
-    cluster_node02_address: ${_param:stacklight_node02_address}
-    cluster_node03_hostname: ${_param:stacklight_node03_hostname}
-    cluster_node03_address: ${_param:stacklight_node03_address}
+    cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
@@ -60,9 +65,8 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    # InfluxDB
+    influxdb_port: 8086
     influxdb_admin_password: password
-    influxdb_port: 15016
     influxdb_stacklight_password: lmapass
     influxdb_client_host: ${_param:stacklight_monitor_address}
     influxdb_client_port: ${_param:influxdb_port}
@@ -71,7 +75,9 @@
     prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
+    remote_collector_telegraf_host: monitoring_remote_agent
+    rabbitmq_openstack_password: workshop
+    heka_amqp_host: ${_param:kubernetes_control_address}
   elasticsearch:
     server:
       heap: