diff --git a/.kitchen.yml b/.kitchen.yml
index 13d01b3..ad2e7a4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,12 +18,15 @@
     - name: linux
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      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:
       "*":
@@ -76,8 +79,7 @@
   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:
   - name: xenial-20177
@@ -85,65 +87,37 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-
-  - name: server_cluster_ocata
+<% for os_version in ['pike','queens'] %>
+  - name: server_cluster_<%=os_version%>
     provisioner:
       pillars:
         release.sls:
           aodh:
             server:
-              version: ocata
+              version: <%=os_version%>
       pillars-from-files:
         aodh.sls: tests/pillar/server_cluster.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
 
-  - name: server_cluster_pike
+  - name: server_single_<%=os_version%>
     provisioner:
       pillars:
         release.sls:
           aodh:
             server:
-              version: pike
-      pillars-from-files:
-        aodh.sls: tests/pillar/server_cluster.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
-  - name: server_single_ocata
-    provisioner:
-      pillars:
-        release.sls:
-          aodh:
-            server:
-              version: ocata
+              version: <%=os_version%>
       pillars-from-files:
         aodh.sls: tests/pillar/server_single.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
 
-  - name: server_single_pike
+  - name: server_cluster_ssl_<%=os_version%>
     provisioner:
       pillars:
         release.sls:
           aodh:
             server:
-              version: pike
-      pillars-from-files:
-        aodh.sls: tests/pillar/server_single.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
-
-  - name: server_cluster_ssl_pike
-    provisioner:
-      pillars:
-        release.sls:
-          aodh:
-            server:
-              version: pike
+              version: <%=os_version%>
         top.sls:
           base:
             "*":
@@ -153,15 +127,15 @@
               - ssl
       pillars-from-files:
         aodh.sls: tests/pillar/server_cluster.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
 
-  - name: server_single_ssl_pike
+  - name: server_single_ssl_<%=os_version%>
     provisioner:
       pillars:
         release.sls:
           aodh:
             server:
-              version: pike
+              version: <%=os_version%>
         top.sls:
           base:
             "*":
@@ -171,6 +145,6 @@
               - ssl
       pillars-from-files:
         aodh.sls: tests/pillar/server_single.sls
-        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
-
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+<% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125