diff --git a/.kitchen.yml b/.kitchen.yml
index cd31120..fcf9958 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,6 +23,10 @@
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
       branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+    - name: oslo_templates
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":
@@ -34,14 +38,14 @@
         "*":
           - linux_repo_openstack
           - glance
+          - release
 
 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:
 
@@ -50,55 +54,50 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-<% for os_version in ['ocata','pike','queens','rocky'] %>
-  - name: cluster
+<% for os_version in ['pike','queens','rocky'] %>
+  - name: cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/cluster.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single_ceph
+  - name: single_ceph_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_ceph.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single_barbican
+  - name: single_barbican_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_barbican.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single
+  - name: single_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 <% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file