diff --git a/.gitreview b/.gitreview
index 28c7a694..2ab9b351 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-network.git
+defaultbranch=stable/queens
diff --git a/Berksfile b/Berksfile
index 9f53c791..6dc33221 100644
--- a/Berksfile
+++ b/Berksfile
@@ -8,7 +8,10 @@ source 'https://supermarket.chef.io'
   end
 end
 
-cookbook 'openstackclient',
-  github: 'cloudbau/cookbook-openstackclient'
+if Dir.exist?('../cookbook-openstackclient')
+  cookbook 'openstackclient', path: '../cookbook-openstackclient'
+else
+  cookbook 'openstackclient', git: 'https://git.openstack.org/openstack/cookbook-openstackclient', branch: 'stable/queens'
+end
 
 metadata
diff --git a/bootstrap.sh b/bootstrap.sh
index 41bbec71..7d17fb35 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,5 +2,5 @@
 ## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
 ## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
 
-wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh
+wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/queens/bootstrap.sh
 /bin/bash -x common-bootstrap.sh