diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 172f5b2..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
\ No newline at end of file
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
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 33253ee..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
-  - docker
-
-install:
-  - pip install PyYAML
-  - pip install virtualenv
-  - |
-    if [ ! -e Gemfile ]; then
-       curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
-    fi
-  - bundle install
-
-env:
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=compute-dpdk
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=compute-dvr-fwaas-v1
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=compute-nonexternal-dvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=compute-qos-sriov
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=queens SUITE=compute-ovn
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=control-cluster
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=control-nodvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=ocata SUITE=control-fwaas-v1
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=control-opendaylight
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=control-qos
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-dvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-qos
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-legacy-l2gw
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=compute-dvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=compute-legacy
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=compute-sriov
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=compute-qos
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=control-dvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=control-lbaas-octavia
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=control-l2gw
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=control-single
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=queens SUITE=control-ovn
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-dvr
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-legacy
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=ocata SUITE=gateway-legacy-fwaas-v1
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=pike SUITE=gateway-legacy-opendaylight
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 OS_VERSION=rocky SUITE=control-ovn
-    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 OS_VERSION=rocky SUITE=compute-ovn
-
-before_script:
-  - set -o pipefail
-  - make test | tail
-
-script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6123573504759330786b
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: never  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-    on_cancel: never    # options: [always|never|change] default: always
-    on_error: never    # options: [always|never|change] default: always
-  email: false
\ No newline at end of file
diff --git a/tests/pillar/compute_bgpvpn.sls b/tests/pillar/compute_bgpvpn.sls
index 78b7801..ac87afb 100644
--- a/tests/pillar/compute_bgpvpn.sls
+++ b/tests/pillar/compute_bgpvpn.sls
@@ -16,11 +16,3 @@
       extension:
         bagpipe_bgpvpn:
           enabled: True
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack_pike:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/xenial pike main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/xenial/archive-mcppike.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_extra.sls b/tests/pillar/repo_extra.sls
new file mode 100644
index 0000000..f6b675b
--- /dev/null
+++ b/tests/pillar/repo_extra.sls
@@ -0,0 +1,8 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_extra:
+        source: "deb http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }}/archive-extra.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_mitaka.sls b/tests/pillar/repo_mitaka.sls
deleted file mode 100644
index 625210a..0000000
--- a/tests/pillar/repo_mitaka.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/ mitaka main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_mos9.sls b/tests/pillar/repo_mos9.sls
deleted file mode 100644
index cd14fe8..0000000
--- a/tests/pillar/repo_mos9.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack:
-        source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
diff --git a/tests/pillar/repo_newton.sls b/tests/pillar/repo_newton.sls
deleted file mode 100644
index e11cb18..0000000
--- a/tests/pillar/repo_newton.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/xenial/ newton main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_ocata.sls b/tests/pillar/repo_ocata.sls
index 41d42d1..f97b30a 100644
--- a/tests/pillar/repo_ocata.sls
+++ b/tests/pillar/repo_ocata.sls
@@ -2,7 +2,7 @@
   system:
     enabled: true
     repo:
-      mirantis_openstack:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main"
+      mirantis_openstack_ocata:
+        source: "deb http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
\ No newline at end of file
+        key_url: "http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }}/archive-ocata.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_opencontrail_41.sls b/tests/pillar/repo_opencontrail_41.sls
new file mode 100644
index 0000000..8068c0d
--- /dev/null
+++ b/tests/pillar/repo_opencontrail_41.sls
@@ -0,0 +1,8 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_opencontrail_4_1:
+        source: "deb http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }}/archive-opencontrail-4.1.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_pike.sls b/tests/pillar/repo_pike.sls
index 6e29aab..6c46643 100644
--- a/tests/pillar/repo_pike.sls
+++ b/tests/pillar/repo_pike.sls
@@ -3,6 +3,6 @@
     enabled: true
     repo:
       mirantis_openstack_repo:
-        source: "deb http://mirror.mirantis.com/stable/openstack-pike/xenial xenial main"
+        source: "deb http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.mirantis.com/stable/openstack-pike/xenial/archive-pike.key"
\ No newline at end of file
+        key_url: "http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
diff --git a/tests/pillar/repo_queens.sls b/tests/pillar/repo_queens.sls
index 46f7bd9..3afd69b 100644
--- a/tests/pillar/repo_queens.sls
+++ b/tests/pillar/repo_queens.sls
@@ -3,6 +3,6 @@
     enabled: true
     repo:
       mirantis_openstack_queens:
-        source: "deb http://mirror.mirantis.com/stable/openstack-queens/xenial xenial main"
+        source: "deb http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.mirantis.com/stable/openstack-queens/xenial/archive-queens.key"
\ No newline at end of file
+        key_url: "http://mirror.mirantis.com/nightly/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
\ No newline at end of file
diff --git a/tests/pillar/repo_rocky.sls b/tests/pillar/repo_rocky.sls
index fa26377..e9e160b 100644
--- a/tests/pillar/repo_rocky.sls
+++ b/tests/pillar/repo_rocky.sls
@@ -3,6 +3,6 @@
     enabled: true
     repo:
       mirantis_openstack_rocky:
-        source: "deb http://mirror.mirantis.com/nightly/openstack-rocky/xenial xenial main"
+        source: "deb http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.mirantis.com/nightly/openstack-rocky/xenial/archive-openstack-rocky.key"
\ No newline at end of file
+        key_url: "http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }}/archive-openstack-rocky.key"
\ No newline at end of file