diff --git a/.gitreview b/.gitreview
index 714780d..815c405 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-barbican-vault.git
+
+defaultbranch=stable/20.05
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index 3e013cd..a36569d 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -16,16 +16,16 @@ relations:
   - barbican-vault:secrets-storage
 applications:
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   barbican:
     series: bionic
-    charm: cs:~openstack-charmers-next/barbican
+    charm: cs:~openstack-charmers/barbican
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
@@ -34,8 +34,8 @@ applications:
     charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
index 256c904..8c8a829 100644
--- a/src/tests/bundles/bionic-stein.yaml
+++ b/src/tests/bundles/bionic-stein.yaml
@@ -16,16 +16,16 @@ relations:
   - barbican-vault:secrets-storage
 applications:
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   barbican:
     series: bionic
-    charm: cs:~openstack-charmers-next/barbican
+    charm: cs:~openstack-charmers/barbican
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
@@ -34,8 +34,8 @@ applications:
     charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index d47a672..c57b109 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -16,16 +16,16 @@ relations:
   - barbican-vault:secrets-storage
 applications:
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   barbican:
     series: bionic
-    charm: cs:~openstack-charmers-next/barbican
+    charm: cs:~openstack-charmers/barbican
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
@@ -34,8 +34,8 @@ applications:
     charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index fcd6ef8..70c4f5c 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -16,15 +16,15 @@ relations:
   - barbican-vault:secrets-storage
 applications:
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   barbican:
-    charm: cs:~openstack-charmers-next/barbican
+    charm: cs:~openstack-charmers/barbican
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
@@ -32,8 +32,8 @@ applications:
     charm: ../../../barbican-vault
     num_units: 0
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index f1e493f..4094350 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -20,14 +20,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   barbican-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -37,7 +37,7 @@ applications:
       - '2'
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -45,7 +45,7 @@ applications:
       - '3'
 
   barbican:
-    charm: cs:~openstack-charmers-next/barbican
+    charm: cs:~openstack-charmers/barbican
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -57,7 +57,7 @@ applications:
     num_units: 0
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
@@ -65,7 +65,7 @@ applications:
       - '5'
 
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1
     to:
       - '6'
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index af15b6e..bbaaa63 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,2 +1,6 @@
 # Pin hvac for a consistent response type
 hvac==0.10.1
+
+git+https://opendev.org/openstack/charms.openstack.git@stable/20.05#egg=charms.openstack
+
+git+https://github.com/juju/charm-helpers.git@stable/20.05#egg=charmhelpers