diff --git a/.kitchen.openstack.yml b/.kitchen.openstack.yml
index 073881b..8e3a743 100644
--- a/.kitchen.openstack.yml
+++ b/.kitchen.openstack.yml
@@ -11,17 +11,16 @@
   openstack_network_name: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
   security_groups:
   - kitchen
-  network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '2d161ac2-1687-459e-921a-8f7a82a36b5e' %>
+  network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '2bf901d4-c58c-4916-a49e-49fc3c265510' %>
   user_data: user_data.sh
   require_chef_omnibus: false
   floating_ip_pool: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
   allocate_floating_ip: true
-  image_id: <%= ENV['OS_IMAGE_ID'] %>
-  flavor_id: <%= ENV['OS_FLAVOR_ID'] || 'ac2a36af-f9a0-4af7-8220-e85cff4d2bce' %>
-  server_name: <%= ENV['SUITE'] %>-ubuntu-<%= ENV['UBUNTU_VERSION'].gsub ".","_" %>-salt-<%= ENV['SALT_VERSION'].gsub ".","_" %>
+  flavor_id: <%= ENV['OS_FLAVOR_ID'] || '13f2c9bc-1f97-441c-96f1-caba1a82b734' %>
   read_timeout: 720
   write_timeout: 720
   connect_timeout: 360
+  mcp_ruby_version: '2.5.0'
 
 transport:
   username: kitchen
@@ -29,13 +28,12 @@
   connection_timeout: 10
   connection_retries: 60
 
-provisioner:
-  name: salt_solo
+salt_config: &salt_config
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%= ENV['SALT_VERSION'] %>
-  salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/<%= ENV['UBUNTU_VERSION'] || '16.04' %>/amd64/latest/SALTSTACK-GPG-KEY.pub
-  salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/<%= ENV['UBUNTU_VERSION'] || '16.04' %>/amd64/
+
+provisioner:
+  name: salt_solo
   require_chef: false
   log_level: info
   formula: iptables
@@ -54,7 +52,26 @@
   sudo: true
 
 platforms:
-  - name: saltstack-ubuntu-<%= ENV['UBUNTU_DISTRO'] || 'xenial' %>-salt-<%= ENV['SALT_VERSION'] || '2018.3.0' %>
+<% for salt_version in ['2017.7.6', '2018.3.3'] %>
+  - name: saltstack-ubuntu-xenial-salt-<%=salt_version.gsub(".","_")%>
+    driver:
+      image_id: 'a64f6d20-167d-4b67-9dd6-bbfc5f7e1859'
+      server_name: iptables-ubuntu-16_04-salt-<%=salt_version.gsub(".","_")%>
+    provisioner:
+      <<: *salt_config
+      salt_version: <%=salt_version%>
+      salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+      salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/
+  - name: saltstack-ubuntu-bionic-salt-<%=salt_version.gsub(".","_")%>
+    driver:
+      image_id: '0c681b14-0034-447b-9379-75fad4d6fa56'
+      server_name: iptables-ubuntu-18_04-salt-<%=salt_version.gsub(".","_")%>
+    provisioner:
+      <<: *salt_config
+      salt_version: <%=salt_version%>
+      salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+      salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/
+<% end %>
 
 suites:
   - name: iptables