diff --git a/.gitreview b/.gitreview
index efc710b..eb30058 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-ops-database.git
+defaultbranch=stable/queens
diff --git a/Berksfile b/Berksfile
index 1f9a110..80236a9 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,11 +1,9 @@
 source 'https://supermarket.chef.io'
 
-%w(common).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
+if Dir.exist?("../cookbook-openstack-common")
+  cookbook "openstack-common", path: "../cookbook-openstack-common"
+else
+  cookbook "openstack-common", git: "https://git.openstack.org/openstack/cookbook-openstack-common", branch: 'stable/queens'
 end
 
 metadata
diff --git a/bootstrap.sh b/bootstrap.sh
index fe49ef2..676f697 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,7 +2,7 @@
 ## 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.
 
-curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
+curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/stable/queens/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \