diff --git a/.kitchen.yml b/.kitchen.yml
index 8a58433..6895df4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,12 +6,16 @@ provisioner:
   name: ansible_playbook
   hosts: localhost
   roles_path: ../
-  require_ansible_repo: true
-  ansible_verbose: true
+  require_ansible_repo: false
+  require_ansible_omnibus: false
+  require_ansible_source: false
+  require_pip: true
   ansible_version: 2.3.2.0
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   https_proxy: <%= ENV['HTTPS_PROXY'] %>
   no_proxy: localhost,127.0.0.1
+  ignore_extensions_from_root: [".git"]
+  ignore_paths_from_root: [".git"]
 
 platforms:
   - name: ubuntu-14.04
@@ -22,6 +26,7 @@ platforms:
         - apt-get update && apt-get install -y software-properties-common &&  add-apt-repository -y ppa:ansible/ansible
         - apt-get update && apt-get -y -q install python-apt python-pycurl python-pip
         - pip install jmespath
+        - pip uninstall -y ansible
       use_sudo: false
       volume: <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json
   - name: ubuntu-16.04
@@ -33,6 +38,7 @@ platforms:
         - apt-get install -y -q net-tools
         - apt-get update && apt-get -y -q install python-apt python-pycurl python-pip
         - pip install jmespath
+        - pip uninstall -y ansible
       use_sudo: false
       volume: <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json
       run_command: "/sbin/init"
@@ -43,11 +49,11 @@ platforms:
       provision_command:
         - apt-get update && apt-get -y install python python-dev python-pip build-essential libyaml-dev python-yaml curl wget
         - apt-get install -y -q net-tools
-        - apt-get install -y ansible
         - sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
         - sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
         - sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
         - pip install jmespath
+        - pip uninstall -y ansible
       volume: <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json
       use_sudo: false
       run_command: "/sbin/init"
@@ -62,6 +68,7 @@ platforms:
         - yum -y install initscripts
         - yum clean all
         - pip install jmespath
+        - pip uninstall -y ansible
       volume: <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json
       run_command: "/usr/sbin/init"
       privileged: true
diff --git a/Gemfile b/Gemfile
index 963ecf1..19ff394 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'test-kitchen', '1.17.0'
-gem "kitchen-docker", '2.6.0'
+gem 'kitchen-docker', '2.6.0'
 gem 'kitchen-ansible', '0.47.3'
-gem 'net-ssh', '~> 3.0'
+gem 'net-ssh', '4.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7df8640..b12337d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
     mixlib-versioning (1.2.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     safe_yaml (1.0.4)
@@ -37,7 +37,7 @@ PLATFORMS
 DEPENDENCIES
   kitchen-ansible (= 0.47.3)
   kitchen-docker (= 2.6.0)
-  net-ssh (~> 3.0)
+  net-ssh (= 4.1.0)
   test-kitchen (= 1.17.0)
 
 BUNDLED WITH