diff --git a/.gitignore b/.gitignore
index f116ba8..d7ee44a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ berks-cookbooks/
 .coverage/
 *.swp
 Berksfile.lock
-Gemfile.lock
 Vagrantfile
+Gemfile.lock
diff --git a/.rubocop.yml b/.rubocop.yml
index cebff3f..5e0be9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   Include:
     - metadata.rb
@@ -9,7 +11,9 @@ AllCops:
     - resources/**
     - spec/**
   Exclude:
-    - berks-cookbooks/**
+    - .cookbooks/**/*
+    - berks-cookbooks/**/*
+    - .bundle/**/*
 
 Encoding:
   Exclude:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000..e4e3b95
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,34 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-02-27 14:31:02 -0600 using RuboCop version 0.29.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FirstParameterIndentation:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 27
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
index 13cda97..1299374 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.16'
+gem 'chef', '~> 11.18.6'
 gem 'json', '<= 1.7.7' # chef 11 dependency
-gem 'berkshelf', '~> 3.1.5'
+gem 'berkshelf', '~> 3.2.1'
+gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
+gem 'rspec', '~> 3.0.0'
 gem 'foodcritic', '~> 4.0'
-gem 'rubocop', '~> 0.18.1'
+gem 'rubocop', '~> 0.29.1'
diff --git a/metadata.rb b/metadata.rb
index cf5a2bc..940ba36 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,15 +4,15 @@ maintainer        'Rackspace US, Inc.'
 license           'Apache 2.0'
 description       'Installs and configures the Tempest Integration Test Suite'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.0.0'
+version           '11.0.0'
 recipe            'openstack-integration-test::setup', 'Installs and configures Tempest'
 
 %w{ ubuntu fedora redhat centos }.each do |os|
   supports os
 end
 
-depends           'openstack-common', '>= 10.2.0'
-depends           'openstack-identity', '>= 10.0.0'
-depends           'openstack-image', '>= 10.0.0'
-depends           'openstack-compute', '>= 10.0.0'
-depends           'openstack-block-storage', '>= 10.0.0'
+depends           'openstack-common', '>= 11.0.0'
+depends           'openstack-identity', '>= 11.0.0'
+depends           'openstack-image', '>= 11.0.0'
+depends           'openstack-compute', '>= 11.0.0'
+depends           'openstack-block-storage', '>= 11.0.0'