diff --git a/.kitchen.yml b/.kitchen.yml
index 24684ec..2c3b809 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -49,8 +49,7 @@
   sudo: true
 
 docker_images:
-  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
-  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
 
 platforms:
   - name: xenial-2017.7
@@ -58,13 +57,8 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-<% for os_version in ['mitaka','newton','ocata','pike', 'queens', 'rocky'] %>
+<% for os_version in ['pike', 'queens', 'rocky'] %>
   - name: compute_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
@@ -87,7 +81,7 @@
             controller:
               version: <%=os_version%>
 <% end %>
-<% for os_version in ['queens', ] %>
+<% for os_version in ['queens'] %>
   - name: compute_single_ssl_<%=os_version%>
     driver:
       devices: