diff --git a/.kitchen.yml b/.kitchen.yml
index 9ef697b..49b8836 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,10 +17,12 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
     - name: salt
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-salt.git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/salt.git
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":
@@ -39,17 +41,24 @@
   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'] || 'ubuntu-xenial'%>
+  - name: xenial-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-
   - name: agent
     provisioner:
       pillars-from-files:
         fluentd.sls: tests/pillar/agent.sls
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file