diff --git a/.kitchen.yml b/.kitchen.yml
index 4e883fc..4cfb1a2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -36,16 +36,13 @@
           - linux_repo_openstack
           - manila
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
 
 verifier:
   name: inspec
   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
@@ -53,64 +50,63 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-
-  - name: server_cluster
+<% for os_version in ['pike','queens','rocky'] %>
+  - name: server_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         manila.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
         share.sls:
           manila:
             share:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
 
-  - name: server_single
+  - name: server_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         manila.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           manila:
             common:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
 
-  - name: share_nexenta
+  - name: share_nexenta_<%=os_version%>
     provisioner:
       pillars-from-files:
         manila.sls: tests/pillar/share_nexenta.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           manila:
             common:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
 
-  - name: share_glusterfs
+  - name: share_glusterfs_<%=os_version%>
     provisioner:
       pillars-from-files:
         manila.sls: tests/pillar/share_glusterfs.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           manila:
             common:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
 
-  - name: server_cluster_ssl
+  - name: server_cluster_ssl_<%=os_version%>
     provisioner:
       pillars-from-files:
         manila.sls: tests/pillar/server_cluster_ssl.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           manila:
             common:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
+<% end %>
 
-
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
-
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file