diff --git a/.kitchen.yml b/.kitchen.yml
index a1f9521..ad6b12e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,10 +17,16 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: keystone
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-keystone
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
+    - name: oslo_templates
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -32,39 +38,66 @@
         "*":
           - linux_repo_openstack
           - glance
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mos9.sls
+          - release
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &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: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+
+  - name: xenial-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
       platform: ubuntu
 
 suites:
-
-  - name: cluster
+<% for os_version in ['pike','queens'] %>
+  - 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:
+        release.sls:
+          glance:
+            server:
+              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:
+        release.sls:
+          glance:
+            server:
+              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:
+        release.sls:
+          glance:
+            server:
+              version: <%=os_version%>
 
-  - name: single
+  - name: single_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single.sls
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          glance:
+            server:
+              version: <%=os_version%>
+<% end %>
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file