diff --git a/.kitchen.yml b/.kitchen.yml
index 5e091ff..39f401f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,18 +8,12 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
+  salt_version: latest
   require_chef: false
   log_level: error
   formula: neutron
   grains:
     noservices: True
-  vendor_repo:
-    - type: apt
-      url: http://apt-mk.mirantis.com/trusty
-      key_url: http://apt-mk.mirantis.com/public.gpg
-      components: oc303 extra
-      distribution: nightly
   dependencies:
     - name: linux
       repo: git
@@ -41,289 +35,376 @@
         "*":
           - linux_repo_openstack
           - neutron
-  pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_<%= ENV['OS_VERSION'] || 'mos9' %>.sls
 
 verifier:
   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'] || '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
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites:
-
-  - name: compute_dpdk
+<% for os_version in ['ocata','pike','queens','rocky'] %>
+  - name: compute_dpdk_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dpdk.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+              version: <%=os_version%>
 
-  - name: compute_dvr
+  - name: compute_dvr_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dvr.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'pike' %>
+              version: <%=os_version%>
 
-  - name: compute_dvr_fwaas_v1
+  - name: compute_dvr_fwaas_v1_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dvr_fwaas_v1.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: compute_legacy
+  - name: compute_legacy_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_legacy.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+              version: <%=os_version%>
 
-  - name: compute_nonexternal_dvr
+  - name: compute_nonexternal_dvr_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_nonexternal_dvr.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+              version: <%=os_version%>
 
-  - name: compute_sriov
+  - name: compute_sriov_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_sriov.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+              version: <%=os_version%>
 
 
-  - name: compute_qos_sriov
+  - name: compute_qos_sriov_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_qos_sriov.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: compute_qos
+  - name: compute_qos_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_qos.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
       pillars:
         release.sls:
           neutron:
             compute:
-              version: <%= ENV['OS_VERSION'] || 'ocata' %>
+              version: <%=os_version%>
 
-  - name: compute_ovn
+  - name: compute_ovn_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_ovn.sls
-      release.sls:
-        neutron:
-          compute:
-            version: <%= ENV['OS_VERSION'] || 'queens' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: compute_bgpvpn
-    provisioner:
-      pillars-from-files:
-        neutron.sls: tests/pillar/compute_bgpvpn.sls
-      release.sls:
-        neutron:
-          compute:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+<% if os_version != 'ocata' %>
+  # Disabled for now, will be fixed and tracked in https://mirantis.jira.com/browse/PROD-27380
+  # - name: compute_bgpvpn_<%=os_version%>
+  #   provisioner:
+  #     pillars-from-files:
+  #       compute_legacy.sls: tests/pillar/compute_legacy.sls
+  #       neutron.sls: tests/pillar/compute_bgpvpn.sls
+  #       linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+  #     pillars:
+  #        release.sls:
+  #          neutron:
+  #            compute:
+  #              version: <%=os_version%>
 
-  - name: control_cluster
+<% end %>
+
+  - name: control_cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_cluster.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+        linux_repo_opencontrail_41.sls: tests/pillar/repo_opencontrail_41.sls
+        linux_repo_extra.sls: tests/pillar/repo_extra.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_extra
+              - linux_repo_opencontrail_41
+              - linux_repo_openstack
+              - neutron
+        release.sls:
+          neutron:
+            server:
+              version: <%=os_version%>
 
-  - name: control_dvr
+  - name: control_dvr_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_dvr.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_nodvr
+  - name: control_nodvr_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_nodvr.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_lbaas_octavia
+  - name: control_lbaas_octavia_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_lbaas_octavia.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_fwaas_v1
+  - name: control_fwaas_v1_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_fwaas_v1.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_l2gw
+  - name: control_l2gw_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_l2gw.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_opendaylight
+  - name: control_opendaylight_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_opendaylight.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_single
+  - name: control_single_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_single.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+        linux_repo_opencontrail_41.sls: tests/pillar/repo_opencontrail_41.sls
+        linux_repo_extra.sls: tests/pillar/repo_extra.sls
+      pillars:
+        top.sls:
+          base:
+            "*":
+              - linux_repo_extra
+              - linux_repo_opencontrail_41
+              - linux_repo_openstack
+              - neutron
+        release.sls:
+          neutron:
+            server:
+              version: <%=os_version%>
 
-  - name: control_qos
+  - name: control_qos_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_qos.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_ovn
+  - name: control_ovn_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_ovn.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'queens' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_bgpvpn
+<% if os_version != 'ocata' %>
+  # Temporarily deisable bgpvpn tests until it's fixed. More info in https://mirantis.jira.com/browse/PROD-27380
+  # - name: control_bgpvpn_<%=os_version%>
+  #   provisioner:
+  #     pillars-from-files:
+  #       control_nodvr.sls: tests/pillar/control_nodvr.sls
+  #       neutron.sls: tests/pillar/control_bgpvpn.sls
+  #       linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+  #     pillars:
+  #       release.sls:
+  #         neutron:
+  #           compute:
+  #             version: <%=os_version%>
+
+  - name: control_sfc_<%=os_version%>
     provisioner:
       pillars-from-files:
-        neutron.sls: tests/pillar/control_bgpvpn.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
-
-  - name: control_sfc
-    provisioner:
-      pillars-from-files:
+        control_nodvr.sls: tests/pillar/control_nodvr.sls
         neutron.sls: tests/pillar/control_sfc.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'queens' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_dvr
+<% end %>
+
+  - name: gateway_dvr_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_dvr.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_legacy
+  - name: gateway_legacy_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_qos
+  - name: gateway_qos_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_qos.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_legacy_fwaas_v1
+  - name: gateway_legacy_fwaas_v1_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_fwaas_v1.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_legacy_l2gw
+  - name: gateway_legacy_l2gw_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_l2gw.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: gateway_legacy_opendaylight
+  - name: gateway_legacy_opendaylight_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_opendaylight.sls
-      release.sls:
-        neutron:
-          gateway:
-            version: <%= ENV['OS_VERSION'] || 'pike' %>
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
 
-  - name: control_dns
+  - name: control_dns_<%=os_version%>
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_dns.sls
-      release.sls:
-        neutron:
-          server:
-            version: <%= ENV['OS_VERSION'] || 'ocata' %>
-
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
+        linux_repo_openstack.sls: tests/pillar/repo_<%=os_version%>.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%=os_version%>
+<% end %>
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125