diff --git a/.kitchen.yml b/.kitchen.yml
index cd31120..fcf9958 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,6 +23,10 @@
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
       branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+    - name: oslo_templates
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":
@@ -34,14 +38,14 @@
         "*":
           - linux_repo_openstack
           - glance
+          - release
 
 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'%>
+  - &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:
 
@@ -50,55 +54,50 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-<% for os_version in ['ocata','pike','queens','rocky'] %>
-  - name: cluster
+<% for os_version in ['pike','queens','rocky'] %>
+  - name: cluster_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/cluster.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single_ceph
+  - name: single_ceph_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_ceph.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single_barbican
+  - name: single_barbican_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single_barbican.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 
-  - name: single
+  - name: single_<%=os_version%>
     provisioner:
       pillars-from-files:
         glance.sls: tests/pillar/single.sls
         linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
       pillars:
-        glance.sls:
+        release.sls:
           glance:
             server:
-              version: "<%=os_version%>"
+              version: <%=os_version%>
 <% end %>
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_ocata.sls b/tests/pillar/repo_mcp_openstack_ocata.sls
deleted file mode 100644
index 7d73591..0000000
--- a/tests/pillar/repo_mcp_openstack_ocata.sls
+++ /dev/null
@@ -1,52 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      mirantis_openstack:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
-        pin:
-        - pin: 'release a=ocata'
-          priority: 1100
-          package: '*'
-      mirantis_openstack_hotfix:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-hotfix main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
-        pin:
-        - pin: 'release a=ocata-hotfix'
-          priority: 1100
-          package: '*'
-      mirantis_openstack_security:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-security main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
-        pin:
-        - pin: 'release a=ocata-security'
-          priority: 1100
-          package: '*'
-      mirantis_openstack_updates:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-updates main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
-        pin:
-        - pin: 'release a=ocata-uptades'
-          priority: 1100
-          package: '*'
-      mirantis_openstack_holdback:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }} ocata-holdback main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/{{ grains.get('oscodename') }}/archive-mcpocata.key"
-        pin:
-        - pin: 'release a=ocata-holdback'
-          priority: 1100
-          package: '*'
-      mk_openstack:
-        source: "deb [arch=amd64] http://apt-mk.mirantis.com/{{ grains.get('oscodename') }}/ nightly ocata"
-        architectures: amd64
-        key_url: "http://apt-mk.mirantis.com/public.gpg"
-        pin:
-        - pin: 'release a=nightly'
-          priority: 1100
-          package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_pike.sls b/tests/pillar/repo_mcp_openstack_pike.sls
index 789b907..8905a98 100644
--- a/tests/pillar/repo_mcp_openstack_pike.sls
+++ b/tests/pillar/repo_mcp_openstack_pike.sls
@@ -3,10 +3,10 @@
     enabled: true
     repo:
       mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }} pike main"
+        source: "deb http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
         architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/pike/{{ grains.get('oscodename') }}/archive-mcppike.key"
+        key_url: "http://mirror.mirantis.com/nightly/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
         pin:
-        - pin: 'release a=pike'
+        - pin: 'release l=pike'
           priority: 1050
           package: '*'
\ No newline at end of file
diff --git a/tests/pillar/repo_mcp_openstack_rocky.sls b/tests/pillar/repo_mcp_openstack_rocky.sls
index 026ac5c..88a4131 100644
--- a/tests/pillar/repo_mcp_openstack_rocky.sls
+++ b/tests/pillar/repo_mcp_openstack_rocky.sls
@@ -5,7 +5,7 @@
       mirantis_openstack_repo:
         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/{{ grains.get('oscodename') }}/archive-openstack-rocky.key"
+        key_url: "http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }}/archive-rocky.key"
         pin:
         - pin: 'release l=rocky'
           priority: 1050
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"