diff --git a/.kitchen.yml b/.kitchen.yml
index 1d56797..6b412dd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,10 +17,10 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
     - name: oslo_templates
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-oslo-templates
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
   state_top:
     base:
       "*":
@@ -32,58 +32,76 @@
         "*":
           - linux_repo_openstack
           - octavia
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.sls
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
+  - &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'%>
+
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2016.3
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20163
+      platform: ubuntu
+
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-  - name: api_single
+<% for os_version in ['ocata','pike','queens'] %>
+  - name: api_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         octavia.sls: tests/pillar/api_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           octavia:
             api:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: api_cluster
+  - name: api_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         octavia.sls: tests/pillar/api_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           octavia:
             api:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: manager_single
+  - name: manager_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         octavia.sls: tests/pillar/manager_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           octavia:
             manager:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: manager_cluster
+  - name: manager_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         octavia.sls: tests/pillar/manager_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           octavia:
             manager:
-              version: <%= ENV['OS_VERSION'] || 'queens' %>
-
+              version: <%=os_version%>
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125