diff --git a/.kitchen.yml b/.kitchen.yml
index eb4ed88..1941f53 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -3,6 +3,7 @@
   name: docker
   hostname: linux-formula
   run_options: -v /dev/log:/dev/log:ro
+  build_options: --pull
 
 provisioner:
   name: salt_solo
@@ -16,6 +17,7 @@
     - name: salt
       repo: git
       source: http://gerrit.mcp.mirantis.com/salt-formulas/salt
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   grains:
     noservices: true
   state_top:
@@ -32,15 +34,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: network
     provisioner:
       pillars-from-files:
@@ -66,11 +69,6 @@
     provisioner:
       pillars-from-files:
         linux.sls: tests/pillar/system.sls
-
-  - name: system_file
-    provisioner:
-      pillars-from-files:
-        linux.sls: tests/pillar/system_file.sls
       pillars_from_directories:
         - source: tests/example
           dest: srv/salt/linux/files/test