diff --git a/.kitchen.yml b/.kitchen.yml
index 177281b..49bddd3 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: apache
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-apache
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
+      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:
       "*":
@@ -35,49 +41,85 @@
           - gnocchi
           - release
           - storage
-  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/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
+
 platforms:
-  - name: <%= ENV['PLATFORM'] || 'ubuntu-xenial' %>
+  - name: xenial-2017.7
     driver_config:
-      image: <%= ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3' %>
+      image: *xenial-20177
       platform: ubuntu
 
 suites:
-
-  - name: server_cluster
+<% versions = { "pike" => "4.0", "queens" => "4.2"} %>
+<% versions.each do |os_version, gnocchi_version| %>
+  - name: server_cluster_<%=os_version%>_<%=gnocchi_version%>_file
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: <%= ENV['GNOCCHI_VERSION'] || '4.0' %>
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
-                driver: <%= ENV['GNOCCHI_STORAGE'] || 'file' %>
+                driver: file
 
-  - name: server_single
+  - name: server_single_<%=os_version%>_<%=gnocchi_version%>_file
     provisioner:
       pillars-from-files:
         gnocchi.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           gnocchi:
             common:
-              version: <%= ENV['GNOCCHI_VERSION'] || '4.0' %>
+              version: '<%=gnocchi_version%>'
         storage.sls:
           gnocchi:
             common:
               storage:
-                driver: <%= ENV['GNOCCHI_STORAGE'] || 'file' %>
+                driver: file
 
+  - name: server_cluster_<%=os_version%>_<%=gnocchi_version%>_redis
+    provisioner:
+      pillars-from-files:
+        gnocchi.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          gnocchi:
+            common:
+              version: '<%=gnocchi_version%>'
+        storage.sls:
+          gnocchi:
+            common:
+              storage:
+                driver: redis
+
+  - name: server_single_<%=os_version%>_<%=gnocchi_version%>_redis
+    provisioner:
+      pillars-from-files:
+        gnocchi.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          gnocchi:
+            common:
+              version: '<%=gnocchi_version%>'
+        storage.sls:
+          gnocchi:
+            common:
+              storage:
+                driver: redis
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125