diff --git a/.kitchen.yml b/.kitchen.yml
index af28a28..846b372 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -33,7 +33,7 @@
   - name: ubuntu1664
     driver:
       box: ubuntu/xenial64
-      box_url: https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-16.04-64-nocm/versions/1.0.0/providers/virtualbox.box
+      box_url: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-vagrant.box
   - name: apache-trusty
     driver:
       box: apache/trusty64
diff --git a/README.md b/README.md
index 02f9e18..0f43c52 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,7 @@
 ```
 export ipr=<path to infrastructure-puppet repo>
 export ipk=<path to infrastructure-puppet-kitchen repo>
-gem install bundler
-gem install test-kitchen
-gem install kitchen-puppet
-gem install kitchen-vagrant
+gem install bundler test-kitchen kitchen-puppet kitchen-vagrant kitchen-sync
 cd $ipr
 bundle install
 cd $ipk
@@ -83,12 +80,7 @@
 
     $ gem install rubygems-update  # again, might need to be admin/root
     $ update_rubygems              # ... here too
-    $ kitchen login default-ubuntu1664
-    $ sudo gem install puppet
-    $ sudo gem install bundle
-    $ sudo gem install kitchen-sync
 
-remove the block `puppetlabs` and `puppetdeps` from `puppet/data/ubuntu/1604.yaml`
 In the suites section add the excludes in `$ipk/.kitchen.yml`  as follows:
 ```
 suites:
@@ -103,7 +95,6 @@
 
     $ cd $ipk
     $ kitchen create default
-    $ kitchen exec default -c 'sudo gem install deep_merge'
     $ kitchen converge default
 
 Usage
diff --git a/puppet/data/ubuntu/1604.yaml b/puppet/data/ubuntu/1604.yaml
index cf7e399..df2f319 100644
--- a/puppet/data/ubuntu/1604.yaml
+++ b/puppet/data/ubuntu/1604.yaml
@@ -120,46 +120,6 @@
     include:
       deb: true
       src: false
-  'puppetlabs':
-    location: 'https://apt.puppetlabs.com'
-    release: 'xenial'
-    repos: 'main'
-    key:
-      id: '6F6B15509CF8E59E6E469F327F438280EF8D349F'
-      server: 'keyserver.ubuntu.com'
-    include:
-      deb: true
-      src: false
-  'puppetdeps':
-    location: 'https://apt.puppetlabs.com'
-    release: 'xenial'
-    repos: 'dependencies'
-    key:
-      id: '6F6B15509CF8E59E6E469F327F438280EF8D349F'
-      server: 'keyserver.ubuntu.com'
-    include:
-      deb: true
-      src: false
-  'vmware-tools':
-    location: 'http://packages.vmware.com/packages/ubuntu'
-    release: 'trusty'
-    repos: 'main'
-    key:
-      id: '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949'
-      server: 'pool.sks-keyservers.net'
-    include:
-      deb: true
-      src: false
-  'nodesource-6':
-    location: 'https://deb.nodesource.com/node_6.x'
-    release: 'xenial'
-    repos: 'main'
-    key:
-      id: '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280'
-      server: 'pool.sks-keyservers.net'
-    include:
-      deb: true
-      src: false
 
 apt::force:
   'orthrus':