diff --git a/.kitchen.openstack.yml b/.kitchen.openstack.yml
index 0390cfc..1dad750 100644
--- a/.kitchen.openstack.yml
+++ b/.kitchen.openstack.yml
@@ -6,20 +6,20 @@
   openstack_auth_url: <%= ENV['OS_AUTH_URL'] %>
   openstack_domain_name: <%= ENV['OS_DOMAIN_NAME'] %>
   openstack_project_name: <%= ENV['OS_PROJECT_NAME'] %>
-  openstack_identity_api_version: <%= ENV['OS_IDENTITY_VERSION'] || 3 %>
+  openstack_identity_api_version: 3
   availability_zone: <%= ENV['OS_AZ'] || 'nova' %>
   openstack_network_name: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
   security_groups:
   - kitchen
-  network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '21790488-0dc2-4864-9016-ae4f09d8a67f' %>
+  network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '2d161ac2-1687-459e-921a-8f7a82a36b5e' %>
   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' %>
   flavor_id: <%= ENV['OS_FLAVOR_ID'] || 'ac2a36af-f9a0-4af7-8220-e85cff4d2bce' %>
-  read_timeout: 180
-  write_timeout: 180
-  connect_timeout: 180
+  read_timeout: 720
+  write_timeout: 720
+  connect_timeout: 360
 
 transport:
   username: kitchen
@@ -31,9 +31,9 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: <%= ENV['SALT_VERSION'] || '2018.3.0' %>
+  salt_version: <%= ENV['SALT_VERSION'] %>
   require_chef: false
-  log_level: error
+  log_level: info
   formula: iptables
   state_top:
     base:
diff --git a/.travis.yml b/.travis.yml
index 695ee96..ebbd003 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,17 +2,24 @@
 python:
 - "2.7.13"
 sudo: required
+services:
+  - docker
 
 install:
+  - pip install PyYAML
+  - pip install virtualenv
   - |
-    git clone https://gerrit.mcp.mirantis.com/salt-formulas/salt-formulas-scripts
-    sudo -H bash ./salt-formulas-scripts/bootstrap-openstack-kitchen.sh
+    if [ ! -e Gemfile ]; then
+      echo $PWD
+      curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
+    fi
+  - bundle install
 
 env:
-  - UBUNTU_DISTRO=xenial SALT_VERSION=2018.3 SUITE=iptables
-  - UBUNTU_DISTRO=xenial SALT_VERSION=2017.7 SUITE=iptables
-  - UBUNTU_DISTRO=bionic SALT_VERSION=2018.3 SUITE=iptables
-  - UBUNTU_DISTRO=bionic SALT_VERSION=2017.7 SUITE=iptables
+  - UBUNTU_DISTRO=xenial SALT_VERSION='2018.3.0' SUITE=iptables
+  - UBUNTU_DISTRO=xenial SALT_VERSION='2017.7.0' SUITE=iptables
+  # - UBUNTU_DISTRO=bionic SALT_VERSION='2018.3' SUITE=iptables
+  # - UBUNTU_DISTRO=bionic SALT_VERSION='2017.7' SUITE=iptables
 
 before_script:
   - set -o pipefail
diff --git a/Makefile b/Makefile
index d166862..fb69046 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,11 @@
 JOBS := 1
 endif
 
+ifeq (,$(wildcard ./.kitchen.openstack.yml))
+KITCHEN_LOCAL_YAML?=.kitchen.openstack.yml
+else
 KITCHEN_LOCAL_YAML?=.kitchen.yml
+endif
 KITCHEN_OPTS?="--concurrency=$(JOBS)"
 KITCHEN_OPTS_CREATE?=""
 KITCHEN_OPTS_CONVERGE?=""