diff --git a/Berksfile b/Berksfile
index 84e5b6d..cb32219 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,4 +1,6 @@
+source "https://supermarket.getchef.com"
+
 metadata
 
 cookbook "openstack-common",
-  git: "git://github.com/stackforge/cookbook-openstack-common.git"
+  github: "stackforge/cookbook-openstack-common"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57c888..12bbe10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This file is used to list changes made in each version of the openstack-dashboar
 
 ## 10.0.0
 * Upgrading to Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.1
 * python_packages database client attributes have been moved to the -common cookbook
diff --git a/Gemfile b/Gemfile
index 867b07b..e16cf65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.12.0'
 gem 'json', '<= 1.7.7' # chef 11 dependency
-gem 'berkshelf', '~> 2.0.18'
+gem 'berkshelf', '~> 3.1.5'
 gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
 gem 'rspec', '~> 3.0.0'
diff --git a/TESTING.md b/TESTING.md
index 2b52f68..1ed6680 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -11,7 +11,7 @@ To run all of the tests with Strainer:
 Or you may run the tests individually:
 
     $ bundle install --path=.bundle # install gem dependencies
-    $ bundle exec berks install --path=.cookbooks # install cookbook dependencies
+    $ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks
     $ bundle exec strainer test -s Strainerfile # run tests
 
 ## Rubocop  ##
diff --git a/metadata.rb b/metadata.rb
index 2a2e3ff..3ba6875 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -12,5 +12,5 @@ recipe           'openstack-dashboard::server', 'Sets up the Horizon dashboard w
   supports os
 end
 
-depends          'apache2', '>= 1.9.6'
+depends          'apache2', '< 2.0.0'
 depends          'openstack-common', '~> 10.0'