diff --git a/.kitchen.yml b/.kitchen.yml
index 65811e1..d0ff9c2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,7 +17,8 @@
   dependencies:
     - name: heka
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-heka
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/heka
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -32,15 +33,16 @@
   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: client_single
     provisioner:
       pillars-from-files: