diff --git a/.kitchen.openstack.yml b/.kitchen.openstack.yml
index 1dad750..073881b 100644
--- a/.kitchen.openstack.yml
+++ b/.kitchen.openstack.yml
@@ -15,8 +15,10 @@
   user_data: user_data.sh
   require_chef_omnibus: false
   floating_ip_pool: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
-  image_id: <%= ENV['OS_IMAGE_ID'] || '60878bd4-cb4a-4d71-ae02-2a8ee4476d10' %>
+  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 ".","_" %>
   read_timeout: 720
   write_timeout: 720
   connect_timeout: 360
@@ -25,13 +27,15 @@
   username: kitchen
   password: kitchen
   connection_timeout: 10
-  connection_retries: 5
+  connection_retries: 60
 
 provisioner:
   name: salt_solo
   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/
   require_chef: false
   log_level: info
   formula: iptables