diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 29467bc..6a4549f 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -23,8 +23,8 @@
     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.8.6-5
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index ccbd551..f6ba52c 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -16,7 +16,7 @@
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # component docker images
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 8bb4178..9e8e135 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -32,7 +32,7 @@
     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-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index a594585..ffc429e 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -10,7 +10,7 @@
     kubernetes_calico_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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 2718fc1..4e6f16a 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -10,7 +10,7 @@
     kubernetes_calico_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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8ec23c8..a95f18e 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -26,8 +26,8 @@
     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.8.6-5
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index ded77f5..5c292ee 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -24,8 +24,8 @@
     # component docker images
     kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 9e16911..11c4b06 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -27,11 +27,11 @@
     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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index f6898b3..3c2f85e 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -16,7 +16,7 @@
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # component docker images
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index dd9f4c6..9e41e85 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -34,3 +34,28 @@
         topics: "notifications,${_param:stacklight_notification_topic}"
         notify_on:
           state_change: vm_and_task_state
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index fb8b3e3..d7d93e8 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -19,3 +19,28 @@
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
index c7e511f..85ffec0 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
@@ -34,3 +34,28 @@
         topics: "notifications,${_param:stacklight_notification_topic}"
         notify_on:
           state_change: vm_and_task_state
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
index 7fe5d4e..fe6c97d 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
@@ -19,3 +19,28 @@
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
index ad9daba..11849f2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican runtest artifactory)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index a183c0a..9b5b609 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -35,7 +35,6 @@
 - system.reclass.storage.system.openstack_share_single
 - system.reclass.storage.system.openstack_telemetry_cluster
 - cluster.virtual-mcp-pike-dvr-ssl-barbican
-- service.runtest.tempest
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -47,10 +46,6 @@
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
-    runtest_tempest_cfg_dir: /root/rally_reports/
-    runtest_tempest_cfg_name: tempest_generated.conf
-    artifactory_user: artifactory_user
-    artifactory_password: artifactory_password
   linux:
     network:
       interface:
@@ -71,9 +66,6 @@
             dogtag:
               source: pkg
               name: salt-formula-dogtag
-  neutron:
-    client:
-      enabled: true
   reclass:
     storage:
       class_mapping:
@@ -234,46 +226,3 @@
         openstack_telemetry_node03:
           params:
             redis_cluster_role: 'slave'
-  runtest:
-    enabled: True
-    test_target: gtw0*
-    keystonerc_node: ctl01*
-    tempest:
-      enabled: True
-      cfg_dir: ${_param:runtest_tempest_cfg_dir}
-      cfg_name: ${_param:runtest_tempest_cfg_name}
-      DEFAULT:
-        log_file: /home/rally/rally_reports/tempest.log
-      compute:
-        build_timeout: 600
-        min_microversion: 2.1
-        max_microversion: 2.42
-      orchestration:
-        max_template_size: 5440000
-        max_resources_per_stack: 20000
-      dns_feature_enabled:
-        # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
-        # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
-        api_admin: false
-        api_v1: false
-        api_v2: true
-        api_v2_quotas: true
-        api_v2_root_recordsets: true
-        bug_1573141_fixed: true
-      volume-feature-enabled:
-        backup: false
-    artifact_collector:
-      enabled: true
-      artifactory:
-       enabled: true
-       user: ${_param:artifactory_user}
-       password: ${_param:artifactory_password}
-       host: artifactory.mcp.mirantis.net
-       port: 443
-       proto: https
-       endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
-      artifacts:
-        sys_logs:
-          path: /var/log
-        etc:
-          path: /etc
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index ae64c8f..b972747 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -43,6 +43,7 @@
           type: eth
         external_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index a769d1c..236379e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -23,7 +23,7 @@
     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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     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"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index e35f3c5..8f43462 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -22,7 +22,7 @@
     kubernetes_calico_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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     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"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index f93ee90..d95cb34 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -27,11 +27,11 @@
     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.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     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"
-    kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 33bf3dd..6185904 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -25,7 +25,7 @@
     # component docker images
     kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.9-7
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
diff --git a/classes/system b/classes/system
index 47cdd84..00b52f8 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 47cdd84c7f8249e8e7bf5ddd656a61bbd842fb5b
+Subproject commit 00b52f8b45f69f9d76c08c550319251b10c08284