diff --git a/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml b/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
index f15497f..9ab92ef 100644
--- a/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
+++ b/.releasenotes/notes/add-jenkins-and-gerrit-nginx-proxy-support-272f290d7c92480a.yaml
@@ -23,7 +23,7 @@
 
           parameters:
             _param:
-              nginx_proxy_gerrit_server_site_host: ${_param:openstack_proxy_address}
+              nginx_proxy_gerrit_server_site_host: ${_param:cluster_public_host}
               nginx_proxy_gerrit_server_site_port: 8080
               gerrit_http_listen_url: proxy-https://*:8080/
               gerrit_public_host: https://${_param:nginx_proxy_gerrit_server_site_host}:${_param:nginx_proxy_gerrit_server_site_port}
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 44abc9d..a6c2409 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -9,12 +9,21 @@
     linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
     # Per repos
     linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
-    linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
-    linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-${_param:elasticsearch_version}.x/
     linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
     linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb/
     linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
+    #
+    linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
+    linux_system_repo_mcp_update_elasticsearch_curator_url: ${_param:linux_system_repo_update_url}/elasticsearch-curator-5/
+    linux_system_repo_mcp_hotfix_elasticsearch_curator_url: ${_param:linux_system_repo_hotfix_url}/elasticsearch-curator-5/
+    #
+    linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-${_param:elasticsearch_version}.x/
+    linux_system_repo_mcp_update_elasticsearch_url: ${_param:linux_system_repo_update_url}/elasticsearch-${_param:elasticsearch_version}.x/
+    linux_system_repo_mcp_hotfix_elasticsearch_url: ${_param:linux_system_repo_hotfix_url}/elasticsearch-${_param:elasticsearch_version}.x/
+    #
     linux_system_repo_mcp_fluentd_url: ${_param:linux_system_repo_url}/td-agent/
+    linux_system_repo_mcp_update_fluentd_url: ${_param:linux_system_repo_update_url}/td-agent/
+    linux_system_repo_mcp_hotfix_fluentd_url: ${_param:linux_system_repo_hotfix_url}/td-agent/
     #
     linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
     linux_system_repo_update_mcp_docker_url: ${_param:linux_system_repo_update_url}/docker/
diff --git a/defaults/salt/init.yml b/defaults/salt/init.yml
index 9ec550e..3193878 100644
--- a/defaults/salt/init.yml
+++ b/defaults/salt/init.yml
@@ -29,6 +29,7 @@
     salt_control_size_image_layout_opencontrail_control: ${_param:salt_control_size_image_layout_default}
     salt_control_size_image_layout_openstack_barbican: ${_param:salt_control_size_image_layout_default}
     salt_control_size_image_layout_openstack_baremetal: ${_param:salt_control_size_image_layout_default}
+    salt_control_size_image_layout_openstack_benchmark: ${_param:salt_control_size_image_layout_default}
     salt_control_size_image_layout_openstack_billing: ${_param:salt_control_size_image_layout_default}
     salt_control_size_image_layout_openstack_control: ${_param:salt_control_size_image_layout_default}
     salt_control_size_image_layout_openstack_database: ${_param:salt_control_size_image_layout_default}
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index fde1172..c09a248 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -36,9 +36,9 @@
     kubernetes_calico_cni_source_hash: md5=2544bc1865c1451cac7a61264c25a2cb
     kubernetes_calico_cni_ipam_source: ${_param:kubernetes_calico_cni_repo}/calico-ipam-v3.3.2
     kubernetes_calico_cni_ipam_source_hash: md5=b22623eeea3b29ba8ec071d859ac7055
-    kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.3-2_1544133573591
-    kubernetes_hyperkube_source_hash: md5=fc23eaf3ba63d9ed9d141f465f584012
-    kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.3-2
+    kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.4-3_1547129775753
+    kubernetes_hyperkube_source_hash: md5=7c50744bdb84fd6fe14ef8a835298f74
+    kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.4-3
     kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.4
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
index 09503a2..825b1c2 100644
--- a/linux/system/repo/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -7,5 +7,5 @@
         mcp_fluentd:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
           key: ${_param:linux_system_repo_mcp_fluentd_key}
-          architectures: amd64
+          architectures: ${_param:linux_system_architecture}
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml
new file mode 100644
index 0000000..46913a0
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_elasticsearch_hotfix:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_elasticsearch_url}/${_param:linux_system_codename} stable main"
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml
new file mode 100644
index 0000000..63d085f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_elasticsearch_curator_hotfix:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_elasticsearch_curator_url}/${_param:linux_system_codename} stable main"
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml
new file mode 100644
index 0000000..f17a85a
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.hotfix.elastic.es
+- system.linux.system.repo.mcp.apt_mirantis.hotfix.elastic.es_curator
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml
new file mode 100644
index 0000000..b311896
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.fluentd
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_fluentd_hotfix:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+          key: ${_param:linux_system_repo_mcp_fluentd_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml b/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
index 02b3a8d..ceea50c 100644
--- a/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
+++ b/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
@@ -1,7 +1,7 @@
 # This is global pin rule for all packages, provided by Mirantis.
 # Quoting official man of apt:
 # `Preferences are a strong power in the hands of a system administrator but they can become also their biggest nightmare if used without care!`
-# aka, don't change and dont' add any new rules, w\o extra neccecity.
+# aka, don't change and don't add any new rules, w\o extra neccecity.
 parameters:
   linux:
     system:
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml
new file mode 100644
index 0000000..e4e958c
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_elasticsearch_update:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_elasticsearch_url}/${_param:linux_system_codename} stable main"
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml
new file mode 100644
index 0000000..51f3895
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_elasticsearch_curator_update:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_elasticsearch_curator_url}/${_param:linux_system_codename} stable main"
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml
new file mode 100644
index 0000000..bbc2b99
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.update.elastic.es
+- system.linux.system.repo.mcp.apt_mirantis.update.elastic.es_curator
diff --git a/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml
new file mode 100644
index 0000000..ca9e95f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.fluentd
+parameters:
+  linux:
+    system:
+      repo:
+        mcp_fluentd_update:
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+          key: ${_param:linux_system_repo_mcp_fluentd_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/murano/server/cluster.yml b/murano/server/cluster.yml
index 6c45f6d..a9b1f6d 100644
--- a/murano/server/cluster.yml
+++ b/murano/server/cluster.yml
@@ -40,7 +40,7 @@
         virtual_host: '/openstack'
       murano_agent_queue:
         engine: rabbitmq
-        host: ${_param:openstack_proxy_address}
+        host: ${_param:cluster_public_host}
         port: 5673
         user: openstack
         password: ${_param:rabbitmq_murano_agent_password}
diff --git a/murano/server/single.yml b/murano/server/single.yml
index 938263d..8c85019 100644
--- a/murano/server/single.yml
+++ b/murano/server/single.yml
@@ -35,7 +35,7 @@
         virtual_host: '/openstack'
       murano_agent_queue:
         engine: rabbitmq
-        host: ${_param:openstack_proxy_address}
+        host: ${_param:cluster_public_host}
         port: 5673
         user: openstack
         password: ${_param:rabbitmq_murano_agent_password}
diff --git a/nginx/server/proxy/openstack/horizon.yml b/nginx/server/proxy/openstack/horizon.yml
index a44f862..d35ffa2 100644
--- a/nginx/server/proxy/openstack/horizon.yml
+++ b/nginx/server/proxy/openstack/horizon.yml
@@ -2,7 +2,7 @@
   _param:
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_api_address: 0.0.0.0
-    nginx_proxy_openstack_horizon_host: ${_param:openstack_proxy_address}
+    nginx_proxy_openstack_horizon_host: ${_param:cluster_public_host}
   nginx:
     server:
       enabled: true
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
index c8223cc..814f65a 100644
--- a/salt/control/cluster/openstack_benchmark_single.yml
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -16,7 +16,7 @@
           ram: 4096
           disk_profile: small
           net_profile: default
-          image_layout: ${_param:salt_control_cluster_node_image_layout_openstack_benchmark}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_benchmark}
       cluster:
         internal:
           domain: ${_param:cluster_domain}
diff --git a/salt/control/cluster/openstack_telemetry_cluster.yml b/salt/control/cluster/openstack_telemetry_cluster.yml
index c215a71..594d671 100644
--- a/salt/control/cluster/openstack_telemetry_cluster.yml
+++ b/salt/control/cluster/openstack_telemetry_cluster.yml
@@ -5,7 +5,7 @@
       user_data:
         write_files:
         - content: |
-            ${salt:control:size:openstack.share:image_layout}
+            ${salt:control:size:openstack.telemetry:image_layout}
           owner: root:root
           path: /usr/share/growlvm/image-layout.yml
   salt: