diff --git a/.gitreview b/.gitreview
index 1bb0ab1..0ab4594 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-cinder-ceph.git
+
+defaultbranch=stable/yoga
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 09fe957..5f8c428 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/yoga
 destination: charmhelpers
 include:
     - core
diff --git a/test-requirements.txt b/test-requirements.txt
index 0aabe17..0c35ba9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -33,8 +33,8 @@ oslo.utils<=3.41.0;python_version<'3.6'
 
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
 
 # Needed for charm-glance:
 git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'