diff --git a/.kitchen.yml b/.kitchen.yml
index 23c6f61..78a4834 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -42,7 +42,7 @@
           - linux_repo_openstack
           - neutron
   pillars-from-files:
-    linux_repo_openstack.sls: tests/pillar/repo_mos9.sls
+    linux_repo_openstack.sls: tests/pillar/repo_<%= ENV['OS_VERSION'] || 'mos9' %>.sls
 
 verifier:
   name: inspec
@@ -60,145 +60,270 @@
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dpdk.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: compute_dvr
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dvr.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: compute_dvr_fwaas_v1
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_dvr_fwaas_v1.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: compute_legacy
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_legacy.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: compute_nonexternal_dvr
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_nonexternal_dvr.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: compute_sriov
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_sriov.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'mitaka' %>
+
 
   - name: compute_qos_sriov
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_qos_sriov.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: compute_qos
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_qos.sls
+      pillars:
+        release.sls:
+          neutron:
+            compute:
+              version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: compute_ovn
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_ovn.sls
+      release.sls:
+        neutron:
+          compute:
+            version: <%= ENV['OS_VERSION'] || 'queens' %>
 
   - name: compute_bgpvpn
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/compute_bgpvpn.sls
+      release.sls:
+        neutron:
+          compute:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: control_cluster
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_cluster.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: control_dvr
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_dvr.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: control_nodvr
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_nodvr.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: control_lbaas_octavia
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_lbaas_octavia.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: control_fwaas_v1
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_fwaas_v1.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: control_l2gw
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_l2gw.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: control_opendaylight
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_opendaylight.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: control_single
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_single.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: control_qos
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_qos.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: control_ovn
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/control_ovn.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'queens' %>
 
   - name: control_bgpvpn
     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:
         neutron.sls: tests/pillar/control_sfc.sls
+      release.sls:
+        neutron:
+          server:
+            version: <%= ENV['OS_VERSION'] || 'queens' %>
 
   - name: gateway_dvr
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_dvr.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: gateway_legacy
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'mitaka' %>
 
   - name: gateway_qos
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_qos.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: gateway_legacy_fwaas_v1
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_fwaas_v1.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'ocata' %>
 
   - name: gateway_legacy_l2gw
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_l2gw.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: gateway_legacy_opendaylight
     provisioner:
       pillars-from-files:
         neutron.sls: tests/pillar/gateway_legacy_opendaylight.sls
+      release.sls:
+        neutron:
+          gateway:
+            version: <%= ENV['OS_VERSION'] || 'pike' %>
 
   - name: control_dns
     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