diff --git a/.kitchen.yml b/.kitchen.yml
index f504ce2..63c57d4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,7 +17,8 @@
   dependencies:
     - name: linux
       repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -27,7 +28,6 @@
     top.sls:
       base:
         "*":
-          - linux_repo_openstack
           - linux_repo_opencontrail
           - linux_repo_cassandra
           - linux
@@ -41,99 +41,59 @@
     opencontrail_juniper.sls: {}
   pillars-from-files:
     linux_repo_cassandra.sls: tests/pillar/repo_cassandra.sls
-    linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_<%= ENV['OC_REPO'] || 'oc311' %>.sls
-    linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
 
 verifier:
   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: single3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/single3.sls
-  - name: single40
+  - name: single_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/single40.sls
+        opencontrail.sls: tests/pillar/single.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: analytics3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics3.sls
-  - name: analytics40
+  - name: analytics_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/analytics40.sls
+        opencontrail.sls: tests/pillar/analytics.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: control3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/control3.sls
-  - name: control40
+  - name: control_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/control40.sls
+        opencontrail.sls: tests/pillar/control.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  - name: cluster3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster3.sls
-  - name: cluster40
+  - name: cluster_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/cluster40.sls
+        opencontrail.sls: tests/pillar/cluster.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
-  # - name: tor3
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor3.sls
-  # - name: tor40
-  #   provisioner:
-  #     pillars-from-files:
-  #       opencontrail.sls: tests/pillar/tor40.sls
-  #       linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-
-  - name: vrouter3
-    provisioner:
-      pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter3.sls
-  - name: vrouter40
+  - name: vrouter_41
     provisioner:
       grains:
         init: 'systemd'
       pillars-from-files:
-        opencontrail.sls: tests/pillar/vrouter40.sls
+        opencontrail.sls: tests/pillar/vrouter.sls
         linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
-    excludes:
-      - trusty-2017.7
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125