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