diff --git a/.kitchen.yml b/.kitchen.yml
index 8138537..4fcc168 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
+  salt_version: latest
   salt_minion_id: salt.ci.local
   require_chef: false
   log_level: error
@@ -49,19 +49,34 @@
   dependencies:
     - name: git
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-git.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/git
     - name: reclass
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-reclass.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/reclass
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
+  - &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-2016.3
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20163
+      platform: ubuntu
+
+  - name: xenial-2017.7
+    driver_config:
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
@@ -119,20 +134,20 @@
         master_ssh_root.sls: tests/pillar/master_ssh_minion_root.sls
         master_formulas.sls: tests/pillar/master_formulas.sls
 
-  - name: master-extpillar-composite
-    provisioner:
-      pillars-from-files:
-        salt.sls: tests/pillar/master_single_extpillars.sls
+  # - name: master-extpillar-composite
+  #   provisioner:
+  #     pillars-from-files:
+  #       salt.sls: tests/pillar/master_single_extpillars.sls
 
-  - name: master-extpillar-reclass
-    provisioner:
-      pillars-from-files:
-        salt.sls: tests/pillar/master_single_extreclass.sls
+  # - name: master-extpillar-reclass
+  #   provisioner:
+  #     pillars-from-files:
+  #       salt.sls: tests/pillar/master_single_extreclass.sls
 
-  - name: master-backward-compat
-    provisioner:
-      pillars-from-files:
-        salt.sls: tests/pillar/master_single_extolddays.sls
+  # - name: master-backward-compat
+  #   provisioner:
+  #     pillars-from-files:
+  #       salt.sls: tests/pillar/master_single_extolddays.sls
 
   - name: control-default
     provisioner: