diff --git a/.gitignore b/.gitignore
index d7ee44a..85227ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,5 @@ berks-cookbooks/
 .vagrant
 .coverage/
 *.swp
-Berksfile.lock
 Vagrantfile
 Gemfile.lock
diff --git a/.gitreview b/.gitreview
index efc710b..b990597 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/cookbook-openstack-ops-database.git
+defaultbranch=stable/liberty
diff --git a/Berksfile b/Berksfile
index 50da25e..68279e0 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,4 +3,5 @@ source "https://supermarket.chef.io"
 metadata
 
 cookbook "openstack-common",
-  github: "openstack/cookbook-openstack-common"
+  github: "openstack/cookbook-openstack-common",
+  branch: 'stable/liberty'
diff --git a/Berksfile.lock b/Berksfile.lock
new file mode 100644
index 0000000..a15fbf3
--- /dev/null
+++ b/Berksfile.lock
@@ -0,0 +1,56 @@
+DEPENDENCIES
+  openstack-common
+    git: git://github.com/openstack/cookbook-openstack-common.git
+    revision: 42214704acfc26c6ac0ac1b21d38b8693fd7f68c
+    branch: stable/liberty
+  openstack-ops-database
+    path: .
+    metadata: true
+
+GRAPH
+  apt (2.9.2)
+  build-essential (2.2.4)
+  chef-sugar (3.1.1)
+  database (4.0.9)
+    postgresql (>= 1.0.0)
+  galera (0.4.1)
+  mariadb (0.3.1)
+    apt (>= 0.0.0)
+    yum (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  mysql (6.0.31)
+    smf (>= 0.0.0)
+    yum-mysql-community (>= 0.0.0)
+  mysql2_chef_gem (1.0.2)
+    build-essential (>= 0.0.0)
+    mariadb (>= 0.0.0)
+    mysql (~> 6.0)
+  openssl (4.4.0)
+    chef-sugar (>= 3.1.1)
+  openstack-common (12.0.0)
+    apt (~> 2.8)
+    database (~> 4.0.2)
+    galera (~> 0.4.1)
+    mariadb (~> 0.3.1)
+    mysql (~> 6.0.13)
+    yum (~> 3.5.4)
+    yum-epel (~> 0.6.0)
+  openstack-ops-database (12.0.0)
+    database (~> 4.0.2)
+    mariadb (~> 0.3.1)
+    mysql (~> 6.0.13)
+    mysql2_chef_gem (~> 1.0.1)
+    openstack-common (>= 12.0.0)
+    postgresql (~> 3.4.18)
+  postgresql (3.4.21)
+    apt (>= 1.9.0)
+    build-essential (>= 0.0.0)
+    openssl (~> 4.0)
+  rbac (1.0.3)
+  smf (2.2.7)
+    rbac (>= 1.0.1)
+  yum (3.5.4)
+  yum-epel (0.6.4)
+    yum (~> 3.2)
+  yum-mysql-community (0.1.19)
+    yum (>= 3.2)
diff --git a/bootstrap.sh b/bootstrap.sh
index fe49ef2..3e2ef9e 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/liberty/bootstrap.sh \
   --retry 3 \
   --silent \
   --show-error \