diff --git a/.kitchen.yml b/.kitchen.yml
index 40d0d57..1d34f62 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,20 +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
     - name: apache
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-apache
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
   state_top:
     base:
       "*":
         - linux.system
         - aodh
   pillars:
-    release.sls:
-      aodh:
-        server:
-          version: <%= ENV['OS_VERSION'] || 'pike' %>
     ssl.sls:
       aodh:
         server:
@@ -71,36 +67,80 @@
           - linux_repo_openstack
           - aodh
           - release
-  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/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'%>
+
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-20177
     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
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
 
-  - name: server_cluster
+  - name: server_cluster_ocata
     provisioner:
+      pillars:
+        release.sls:
+          aodh:
+            server:
+              version: ocata
       pillars-from-files:
         aodh.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
 
-  - name: server_single
+  - name: server_cluster_pike
     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
       pillars-from-files:
         aodh.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_ocata.sls
 
-  - name: server_cluster_ssl
+  - name: server_single_pike
     provisioner:
-      pillars-from-files:
-        aodh.sls: tests/pillar/server_cluster.sls
       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
         top.sls:
           base:
             "*":
@@ -108,12 +148,17 @@
               - aodh
               - release
               - ssl
-
-  - name: server_single_ssl
-    provisioner:
       pillars-from-files:
-        aodh.sls: tests/pillar/server_single.sls
+        aodh.sls: tests/pillar/server_cluster.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
+
+  - name: server_single_ssl_pike
+    provisioner:
       pillars:
+        release.sls:
+          aodh:
+            server:
+              version: pike
         top.sls:
           base:
             "*":
@@ -121,5 +166,8 @@
               - aodh
               - release
               - ssl
+      pillars-from-files:
+        aodh.sls: tests/pillar/server_single.sls
+        linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_pike.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125