diff --git a/.gitignore b/.gitignore
index d7ee44a..fa2b288 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ berks-cookbooks/
 .vagrant
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile
 Gemfile.lock
+Berksfile.lock
diff --git a/.gitreview b/.gitreview
index efc710b..c31dd12 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-ops-database.git
+defaultbranch=stable/pike
diff --git a/Berksfile b/Berksfile
index f9da8f9..2b0c388 100644
--- a/Berksfile
+++ b/Berksfile
@@ -4,7 +4,8 @@ source 'https://supermarket.chef.io'
   if Dir.exist?("../cookbook-openstack-#{cookbook}")
     cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
   else
-    cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"
+    cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}",
+                                      branch: 'stable/pike'
   end
 end
 
diff --git a/bootstrap.sh b/bootstrap.sh
index fe49ef2..1fc6d69 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/pike/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \