diff --git a/.gitignore b/.gitignore
index e92db3f..39b1985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
 .bundle/
 .cookbooks/
+.kitchen/
+.vagrant/
+.coverage/
+*.swp
+Berksfile.lock
+Gemfile.lock
+Vagrantfile
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ec6c1..c4bc8da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This file is used to list changes made in each version of cookbook-openstack-orchestration
 
+## 10.0.0
+* Upgrading to Juno
+
 ## 9.2.0
 * python_packages database client attributes have been migrated to
 the -common cookbook
diff --git a/Gemfile b/Gemfile
index 998a645..ac66595 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,11 @@
 # encoding: UTF-8
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.8'
+gem 'chef', '~> 11.12.0'
 gem 'json', '<= 1.7.7' # chef 11 dependency
 gem 'berkshelf', '~> 2.0.18'
 gem 'hashie', '~> 2.0'
-gem 'chefspec', '~> 3.4.0'
-gem 'rspec', '~> 2.14.1'
+gem 'chefspec', '~> 4.0.0'
+gem 'rspec', '~> 3.0.0'
 gem 'foodcritic', '~> 3.0.3'
-gem 'strainer'
 gem 'rubocop', '~> 0.18.1'
diff --git a/Strainerfile b/Strainerfile
deleted file mode 100644
index 1c9a3e0..0000000
--- a/Strainerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Strainerfile
-rubocop: rubocop $SANDBOX/$COOKBOOK
-knife test: knife cookbook test $COOKBOOK
-foodcritic: foodcritic -f any -t ~FC003 -t ~FC023 $SANDBOX/$COOKBOOK
-chefspec: rspec --format documentation $SANDBOX/$COOKBOOK/spec
diff --git a/metadata.rb b/metadata.rb
index 136e01a..f19610b 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer        'IBM, Inc.'
 license           'Apache 2.0'
 description       'Installs and configures the Heat Service'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '9.2'
+version           '10.0'
 recipe            'openstack-orchestration::api', 'Start and configure the Heat API service'
 recipe            'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service'
 recipe            'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service'
@@ -17,5 +17,5 @@ recipe            'openstack-orchestration::identity_registration', 'Registers H
   supports os
 end
 
-depends           'openstack-common', '~> 9.5'
-depends           'openstack-identity', '~> 9.0'
+depends           'openstack-common', '~> 10.0'
+depends           'openstack-identity', '~> 10.0'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 08120e8..03a993e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -25,28 +25,28 @@ SUSE_OPTS = {
 
 shared_context 'orchestration_stubs' do
   before do
-    ::Chef::Recipe.any_instance.stub(:rabbit_servers)
+    allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
       .and_return '1.1.1.1:5672,2.2.2.2:5672'
-    ::Chef::Recipe.any_instance.stub(:address_for)
+    allow_any_instance_of(Chef::Recipe).to receive(:address_for)
       .with('lo')
       .and_return '127.0.1.1'
-    ::Chef::Recipe.any_instance.stub(:get_secret)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
       .with('openstack_identity_bootstrap_token')
       .and_return 'bootstrap-token'
 
-    ::Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('db', 'heat')
       .and_return 'heat'
-    ::Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'guest')
       .and_return 'mq-pass'
-    ::Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'admin-user')
       .and_return 'admin-pass'
-    ::Chef::Recipe.any_instance.stub(:get_password)
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'openstack-orchestration')
       .and_return 'heat-pass'
-    ::Chef::Application.stub(:fatal!)
+    allow(Chef::Application).to receive(:fatal!)
   end
 end