diff --git a/.kitchen.yml b/.kitchen.yml
index bbb6694..8282a64 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,15 +18,19 @@
     - name: linux
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: keystone
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: apache
       repo: git
       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:
       "*":
@@ -39,42 +43,46 @@
           - linux_repo_openstack
           - nova
           - release
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.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'] ||  '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: compute_cluster
+<% for os_version in ['pike', 'queens'] %>
+  - name: compute_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/compute_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           nova:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: control_cluster
+  - name: control_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         nova.sls: tests/pillar/control_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           nova:
             controller:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
-
-  - name: compute_single_ssl
+              version: <%=os_version%>
+<% end %>
+<% for os_version in ['queens', ] %>
+  - name: compute_single_ssl_<%=os_version%>
     driver:
       devices:
         - /dev/mem
@@ -84,10 +92,12 @@
       pillars-from-files:
         compute_single.sls: tests/pillar/compute_single.sls
         nova.sls: tests/pillar/compute_single_ssl.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
         release.sls:
           nova:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
+<% end %>
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125