diff --git a/.kitchen.yml b/.kitchen.yml
index 4cd5d08..c958318 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -5,6 +5,7 @@
   #socket: tcp://127.0.0.1:2376
   use_sudo: false
   run_options: -v /dev/log:/dev/log:ro
+  build_options: --pull
 
 provisioner:
   name: salt_solo
@@ -35,33 +36,33 @@
     linux.sls: tests/pillar/linux.sls
 
   grains:
-    noservices: False
+    noservices: True
     kitchen-test: True
 
   dependencies:
     - name: postgresql
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-postgresql
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/postgresql
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: rsyslog
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-rsyslog
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/rsyslog
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
 
+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'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: *xenial-20177
       platform: ubuntu
 
-
 verifier:
   name: inspec
   sudo: true
 
-
 suites:
-
-
   - name: maas_cluster
     provisioner:
       pillars-from-files: