diff --git a/elasticsearch/server/curator.yml b/elasticsearch/server/curator.yml
index e4e5ace..fe7383d 100644
--- a/elasticsearch/server/curator.yml
+++ b/elasticsearch/server/curator.yml
@@ -12,41 +12,33 @@
         actions:
           - action: delete_indices
             description: >-
-                Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index name).
+                Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index creation date).
             options:
               ignore_empty_list: True
-              timeout_override:
               continue_if_exception: False
               disable_action: False
             filters:
             - filtertype: pattern
               kind: regex
               value: "${_param:elasticsearch_curator_indices_pattern}"
-              exclude:
             - filtertype: age
-              source: name
+              source: creation_date
               direction: older
-              timestring: '%Y.%m.%d'
               unit: days
               unit_count: ${_param:elasticsearch_curator_retention_period}
-              exclude:
           - action: delete_indices
             description: >-
-                Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index name).
+                Delete indices older than ${_param:elasticsearch_curator_retention_period} days (based on index creation date).
             options:
               ignore_empty_list: True
-              timeout_override:
               continue_if_exception: False
               disable_action: False
             filters:
             - filtertype: pattern
               kind: regex
               value: "^events_.*$"
-              exclude:
             - filtertype: age
-              source: name
+              source: creation_date
               direction: older
-              timestring: '%Y-%m-%d'
               unit: days
               unit_count: ${_param:elasticsearch_curator_retention_period}
-              exclude:
\ No newline at end of file
diff --git a/horizon/server/plugin/heat.yml b/horizon/server/plugin/heat.yml
index 9e70480..909da66 100644
--- a/horizon/server/plugin/heat.yml
+++ b/horizon/server/plugin/heat.yml
@@ -5,7 +5,9 @@
         heat:
           source:
             engine: pkg
-            name: openstack-dashboard-heat-server-templates
-        horizon_overrides:
-          overrides:
-          - heat_server_templates
+            name: python-heat-dashboard
+      policy:
+        orchestration:
+          enabled: true
+          name: heat_policy.json
+          source: file
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 5b63d94..6c9eb2a 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -167,7 +167,7 @@
                 default: "http://127.0.0.1:8080"
               TEST_K8S_CONFORMANCE_IMAGE:
                 type: string
-                default: "docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.8.9-7"
+                default: "docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.8.13-11"
 
               TEST_TEMPEST_IMAGE:
                 type: string
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index be2326b..a85342d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -148,6 +148,10 @@
                 type: boolean
                 description: Whether to use container with rally
                 default: "{{use_rally}}"
+              TEST_MILESTONE:
+                type: string
+                description: Product milestone
+                default: ""
         test-openstack-component-periodic:
           name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
           template:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 07a8fb4..d2f1199 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -176,6 +176,12 @@
               PARALLEL_GROUP_SIZE:
                 type: string
                 default: "8"
+              RUN_TEST_IN_DOCKER:
+                type: boolean
+                description: "Run test stage in docker environment"
+              SMOKE_TEST_DOCKER_IMG:
+                type: string
+                default: "ubuntu:16.04"
       job:
         test-salt-formulas-env:
           name: test-salt-formulas-env
diff --git a/kubernetes/control/roles/cluster-admin.yml b/kubernetes/control/roles/cluster-admin.yml
new file mode 100644
index 0000000..6ee5d7d
--- /dev/null
+++ b/kubernetes/control/roles/cluster-admin.yml
@@ -0,0 +1,2 @@
+classes:
+  - service.kubernetes.control.roles.cluster-admin
\ No newline at end of file
diff --git a/kubernetes/control/roles/fluentd-view.yml b/kubernetes/control/roles/fluentd-view.yml
new file mode 100644
index 0000000..b7ab403
--- /dev/null
+++ b/kubernetes/control/roles/fluentd-view.yml
@@ -0,0 +1,2 @@
+classes:
+  - service.kubernetes.control.roles.fluentd-view
\ No newline at end of file
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 17e9006..40cc135 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -14,7 +14,8 @@
     kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.4
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.9
     kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.5
-    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.11-9
+    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.13-11
+    kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.8.13-11
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
     kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
 
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index dcc3ac1..cf334df 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -14,7 +14,8 @@
     kubernetes_calico_calicoctl_image: ${_param:kubernetes_calico_calicoctl_repo}/ctl:v1.6.4
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v2.6.9
     kubernetes_calico_cni_image: ${_param:kubernetes_calico_cni_repo}/cni:v1.11.5
-    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.11-9
+    kubernetes_hyperkube_image: ${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.8.13-11
+    kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.8.13-11
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
     kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
 
diff --git a/openssh/server/team/members/andreidanin.yml b/openssh/server/team/members/andreidanin.yml
new file mode 100644
index 0000000..fb5f170
--- /dev/null
+++ b/openssh/server/team/members/andreidanin.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        adanin:
+          enabled: true
+          name: adanin
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Andrei Danin
+          home: /home/adanin
+          email: adanin@mirantis.com
+  openssh:
+    server:
+      user:
+        adanin:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2eqUIe2KkA5Zlr1yDoY0E5egIaqmbDvIZ+8gyduCDwqouqikgYdwQtMztlEWXEu8FsQqOHKLjBDvzEyFgpEfvRQLYFmp7HtZ32GntBDC9oigtm8OXJr0MEnyAMsdUioDOCD3ixuAGktpJjgIwPPqnMhXgAXuH6Ww7N8sSkN/8paRezQjqDgFZcxaEavse6kj+TdbJb5w382Z7sILss8vWmjhQlYUxc1ZWa/0BCVx9mLnEXAZKfOiEDOX6Pv89VGjOiP5VxmNUCRfuPVEtY671Z73jpqXwduLz6IMbPVdAvz8HQTKqZeuZMPPTasrgNqOIfrSrG5OM8DBqO8LnEffp
+          user: ${linux:system:user:adanin}
+
diff --git a/openssh/server/team/members/brucemathews.yml b/openssh/server/team/members/brucemathews.yml
new file mode 100644
index 0000000..0fc9b63
--- /dev/null
+++ b/openssh/server/team/members/brucemathews.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        bmathews:
+          enabled: true
+          name: bmathews
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Bruce Mathews
+          home: /home/bmathews
+          email: bmathews@mirantis.com
+  openssh:
+    server:
+      user:
+        bmathews:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1tsh+T2JRsyblZBrF17b/Q2AelpY+gTc9BaMQMj1J/Y/aJZUjD22knG8away01DQ+Qew5/Kcx5k4AvmxWkncRX+7ye9sVJA6BQhwewkN/MiiDJ3hC8hNFfk8ki8arqPxasXZOWacT2DDXw7/gc+/DA4F35UvsMmD+JLVr4fkdzQuHre2QPbqs+6+KdHIl0nI+d3hCCd9Zsd1mYlJkDU7oLC085oIsIqToWTYKw6HFKMqocYzuN4TQKI3dySFpkjMXLz8SK8UVjXA+Lyu0ymIVmvGnVDNAImc9ZMeU+l6W4gpuLY30Zw5/8q8FkKBw5FYWgllmoixlwhNRJJ1Hf7tJ
+          user: ${linux:system:user:bmathews}
+
diff --git a/openssh/server/team/members/ryanday.yml b/openssh/server/team/members/ryanday.yml
new file mode 100644
index 0000000..455e4aa
--- /dev/null
+++ b/openssh/server/team/members/ryanday.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        rday:
+          enabled: true
+          name: rday
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Ryan Day
+          home: /home/rday
+          email: rday@mirantis.com
+  openssh:
+    server:
+      user:
+        rday:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5WnQjTI+Elg3I3MeuP1T9Y8FKjuLZSj9qiMbetVb9+AbvjbYqjtam7xWzLxsqeH15d/ZSRHnU4E8f0/Wvk1z9Bl+GKl9+IpLvurewl3WXe2yaeZl4Ey3G9goTLfhluB2BbLqf7gu7t02aei68NhYNkp0Ry1FDBQ75frN1EcUoDubHl4HWJWkTsGJFoiaBTmlNRIkbQBYSEGoY331c4e++W0ZLV+q1rjbXVWcWjzuK+i3wCBrDdAjm4LyPjD60yJ/0n8FO4ChlhnGowhkHxQf7Bt80/QhM8VZuWPG4sQReJ2uMBvkFWRYKf8p2h7MaouFLmUOzW0k/EcILBBZgssekaUhDDyXe3c0Qd6yC2Eb8CCRKgIuhTW9+xTfJhZAFLCPDYN/CDybzvgJSgRCa6esxfCQB+i4aRJOeL5IePXdkO+LY1GMbDzVhIxfPviN4/7NRidvtPHEYwLGvaIQUb/XWX4ILXAhdw/ilfOOu9DQkPzpBTQaAGl9+e2edRP3WAe4fjgCPmeTIruwSRqxJFLdLG19m1JaoRwc7H1cIiUQ1i/lMYq2ntA/60FZRQ/xsLdX5LT+wo896bc3pRxore+zs2o2sATEc84u5eCEFk3wMZvfeJdDz/l489G/1kp1SUKMI1ouyBWoP7qO/fI9m+TXg3jYJ3JOd3pYO7jd3kDBuZQ==
+          user: ${linux:system:user:rday}
+
diff --git a/openssh/server/team/members/sachintripathi.yml b/openssh/server/team/members/sachintripathi.yml
new file mode 100644
index 0000000..0a0092c
--- /dev/null
+++ b/openssh/server/team/members/sachintripathi.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        stripathi:
+          enabled: true
+          name: stripathi
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sachin Tripathi
+          home: /home/stripathi
+          email: stripathi@mirantis.com
+  openssh:
+    server:
+      user:
+        stripathi:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB0W6+M9T/nsGzLRXcXbRwY9S6CfI5VgVWOrxYj190RenC+Z37gMlfwvR6+J2TgQ9NAos/ht7Si7qIjDDLw4UApPDErCTTKuU6cp4eVWR7U6ZDxWSjarGVYC+wOtcb59aTynZcU/W6l86EMjuGO917bxWt1QhR6SQuXGTxvVRbhqLci+APUYJouMwk4G4eia1Y5Pfk4x2+CaVu/7fnXD0YIHcqrujc4OaW3N2ayXCFTE/icBWlIgLv091MkkLgEIInXg2Q40hn9g9h8UMgbRCwyM4f1EwB2xdPQUNpGwtHENBB3fjLoN+IGDKhJsjcCkHsQwdC71O1URYdE6GTJ9sX
+          user: ${linux:system:user:stripathi}
+
diff --git a/openssh/server/team/members/samstoelinga.yml b/openssh/server/team/members/samstoelinga.yml
new file mode 100644
index 0000000..e4e45a4
--- /dev/null
+++ b/openssh/server/team/members/samstoelinga.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        sstoelinga:
+          enabled: true
+          name: sstoelinga
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Sam Stoelinga
+          home: /home/sstoelinga
+          email: sstoelinga@mirantis.com
+  openssh:
+    server:
+      user:
+        sstoelinga:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDh3j+qNzTJJJrbgWaNEJ4/wF0HZB8jFlz8jO3tA4QJCPJGT76LeFZgeFK1Avp0rRHD4dnHyDvjynJpE5TckBEFiQ2kbyRRiv4SmJe+cEaSz+okoXSuW4ZbsiOhX7IZfWqhR9ra0uxviiaecWOIwoci55EPob34stthIbLPlcSYS81kdivhJLUZwRTvVX4rRf6gFiAjYyv5Zc4ckwwtkIG0A6XiuoHEpO7lDlps12GfN9DEsNUfzFGrEWzucGsPIBIDmHiods4kMv3UNYKImX0EltLF5bGlSDOsy6t65Qr/zCXyB23yF4oU7991/yIjMWzSwUJzcmcHk+0Fr0b1WHh/
+          user: ${linux:system:user:sstoelinga}
+
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index e2939be..8361a39 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,3 +1,11 @@
+classes:
+- system.openssh.server.team.members.samstoelinga
+- system.openssh.server.team.members.sachintripathi
+- system.openssh.server.team.members.ryanday
+- system.openssh.server.team.members.pmichalec
+- system.openssh.server.team.members.brucemathews
+- system.openssh.server.team.members.andreidanin
+
 parameters:
   _param:
     linux_system_user_sudo: true