diff --git a/Berksfile b/Berksfile
index 9aaac51..9f53c79 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,10 +1,14 @@
 source 'https://supermarket.chef.io'
 
-metadata
+%w(common identity).each do |cookbook|
+  if Dir.exist?("../cookbook-openstack-#{cookbook}")
+    cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
+  else
+    cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
+  end
+end
 
-cookbook 'openstack-identity',
-  github: 'openstack/cookbook-openstack-identity'
-cookbook 'openstack-common',
-  github: 'openstack/cookbook-openstack-common'
 cookbook 'openstackclient',
   github: 'cloudbau/cookbook-openstackclient'
+
+metadata
diff --git a/metadata.rb b/metadata.rb
index 8ed1f0c..ceee305 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,14 +4,14 @@ maintainer_email 'openstack-dev@lists.openstack.org'
 license          'Apache-2.0'
 description      'Installs and configures the Heat Service'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '16.0.0'
+version          '17.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
 end
 
-depends 'openstack-common', '>= 16.0.0'
-depends 'openstack-identity', '>= 16.0.0'
+depends 'openstack-common', '>= 17.0.0'
+depends 'openstack-identity', '>= 17.0.0'
 depends 'openstackclient'
 
 issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)