diff --git a/.gitreview b/.gitreview
index 0b37d86..446d623 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-percona-cluster.git
+
+defaultbranch=stable/21.04
diff --git a/tests/bundles/bionic-nagios.yaml b/tests/bundles/bionic-nagios.yaml
index b09d826..0a3204d 100644
--- a/tests/bundles/bionic-nagios.yaml
+++ b/tests/bundles/bionic-nagios.yaml
@@ -6,7 +6,7 @@ applications:
     charm: ../../../percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       token-expiration: 60
diff --git a/tests/bundles/bionic.yaml b/tests/bundles/bionic.yaml
index e887743..64b64bc 100644
--- a/tests/bundles/bionic.yaml
+++ b/tests/bundles/bionic.yaml
@@ -8,7 +8,7 @@ applications:
     charm: ../../../percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       token-expiration: 60
diff --git a/tests/bundles/overlays/ha.yaml b/tests/bundles/overlays/ha.yaml
index a08e916..ba1c64b 100644
--- a/tests/bundles/overlays/ha.yaml
+++ b/tests/bundles/overlays/ha.yaml
@@ -9,7 +9,7 @@ applications:
       vip: {{ TEST_VIP00 }}
       min-cluster-size: 3
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
     options:
       cluster_count: 3
diff --git a/tests/bundles/xenial-queens-ha-series-upgrade.yaml b/tests/bundles/xenial-queens-ha-series-upgrade.yaml
index 0e784ac..c903ed2 100644
--- a/tests/bundles/xenial-queens-ha-series-upgrade.yaml
+++ b/tests/bundles/xenial-queens-ha-series-upgrade.yaml
@@ -8,7 +8,7 @@ applications:
     charm: ../../../percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
diff --git a/tests/bundles/xenial.yaml b/tests/bundles/xenial.yaml
index a0575c6..f44e3f5 100644
--- a/tests/bundles/xenial.yaml
+++ b/tests/bundles/xenial.yaml
@@ -8,7 +8,7 @@ applications:
     charm: ../../../percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       token-expiration: 60