diff --git a/.gitreview b/.gitreview
index 091c525..e844524 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-neutron-dynamic-routing.git
+
+defaultbranch=stable/20.02
diff --git a/src/tests/bundles/bionic-queens-functional.yaml b/src/tests/bundles/bionic-queens-functional.yaml
index a297d8c..5e0b1b5 100644
--- a/src/tests/bundles/bionic-queens-functional.yaml
+++ b/src/tests/bundles/bionic-queens-functional.yaml
@@ -8,7 +8,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
+    charm: cs:bionic/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,12 +18,12 @@ applications:
         haproxy-connect-timeout: 9000
     series: bionic
   mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    charm: cs:bionic/percona-cluster
     constraints: mem=4G
     num_units: 1
     series: bionic
   neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    charm: cs:bionic/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -39,12 +39,12 @@ applications:
     num_units: 1
     series: bionic
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    charm: cs:bionic/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     series: bionic
   quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
+    charm: cs:bionic/quagga
     num_units: 1
     series: bionic
 
diff --git a/src/tests/bundles/bionic-rocky-functional.yaml b/src/tests/bundles/bionic-rocky-functional.yaml
index 2057b65..6817901 100644
--- a/src/tests/bundles/bionic-rocky-functional.yaml
+++ b/src/tests/bundles/bionic-rocky-functional.yaml
@@ -7,7 +7,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
+    charm: cs:bionic/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,13 +18,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: bionic
   mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    charm: cs:bionic/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:bionic-rocky'}
     series: bionic
   neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    charm: cs:bionic/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -42,12 +42,12 @@ applications:
     options: {openstack-origin: 'cloud:bionic-rocky'}
     series: bionic
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    charm: cs:bionic/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:bionic-rocky'}
     series: bionic
   quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
+    charm: cs:bionic/quagga
     num_units: 1
     series: bionic
diff --git a/src/tests/bundles/bionic-stein-functional.yaml b/src/tests/bundles/bionic-stein-functional.yaml
index 8631af5..77e8ba4 100644
--- a/src/tests/bundles/bionic-stein-functional.yaml
+++ b/src/tests/bundles/bionic-stein-functional.yaml
@@ -7,7 +7,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
+    charm: cs:bionic/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,13 +18,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: bionic
   mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    charm: cs:bionic/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:bionic-stein'}
     series: bionic
   neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    charm: cs:bionic/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -42,12 +42,12 @@ applications:
     options: {openstack-origin: 'cloud:bionic-stein'}
     series: bionic
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    charm: cs:bionic/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:bionic-stein'}
     series: bionic
   quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
+    charm: cs:bionic/quagga
     num_units: 1
     series: bionic
diff --git a/src/tests/bundles/bionic-train-functional.yaml b/src/tests/bundles/bionic-train-functional.yaml
index c58d20c..9b869f2 100644
--- a/src/tests/bundles/bionic-train-functional.yaml
+++ b/src/tests/bundles/bionic-train-functional.yaml
@@ -7,7 +7,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
+    charm: cs:bionic/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,13 +18,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: bionic
   mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    charm: cs:bionic/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:bionic-train'}
     series: bionic
   neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    charm: cs:bionic/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -42,12 +42,12 @@ applications:
     options: {openstack-origin: 'cloud:bionic-train'}
     series: bionic
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    charm: cs:bionic/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:bionic-train'}
     series: bionic
   quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
+    charm: cs:bionic/quagga
     num_units: 1
     series: bionic
diff --git a/src/tests/bundles/disco-stein-functional.yaml b/src/tests/bundles/disco-stein-functional.yaml
index cd5aad2..69a8ec0 100644
--- a/src/tests/bundles/disco-stein-functional.yaml
+++ b/src/tests/bundles/disco-stein-functional.yaml
@@ -8,7 +8,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/bionic/keystone
+    charm: cs:bionic/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,12 +18,12 @@ applications:
         haproxy-connect-timeout: 9000
     series: disco
   mysql:
-    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    charm: cs:bionic/percona-cluster
     constraints: mem=4G
     num_units: 1
     series: disco
   neutron-api:
-    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    charm: cs:bionic/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -39,12 +39,12 @@ applications:
     num_units: 1
     series: disco
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    charm: cs:bionic/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     series: disco
   quagga:
-    charm: cs:~openstack-charmers-next/bionic/quagga
+    charm: cs:bionic/quagga
     num_units: 1
     series: disco
 
diff --git a/src/tests/bundles/xenial-ocata-functional.yaml b/src/tests/bundles/xenial-ocata-functional.yaml
index 30285de..bb2ae5e 100644
--- a/src/tests/bundles/xenial-ocata-functional.yaml
+++ b/src/tests/bundles/xenial-ocata-functional.yaml
@@ -8,7 +8,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/xenial/keystone
+    charm: cs:xenial/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -19,13 +19,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: xenial
   mysql:
-    charm: cs:~openstack-charmers-next/xenial/percona-cluster
+    charm: cs:xenial/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:xenial-ocata'}
     series: xenial
   neutron-api:
-    charm: cs:~openstack-charmers-next/xenial/neutron-api
+    charm: cs:xenial/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -43,13 +43,13 @@ applications:
     options: {openstack-origin: 'cloud:xenial-ocata'}
     series: xenial
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
+    charm: cs:xenial/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:xenial-ocata'}
     series: xenial
   quagga:
-    charm: cs:~openstack-charmers-next/xenial/quagga
+    charm: cs:xenial/quagga
     num_units: 1
     options: {use-16bit-asn: True}
     series: xenial
diff --git a/src/tests/bundles/xenial-pike-functional.yaml b/src/tests/bundles/xenial-pike-functional.yaml
index 5c51d71..ec2c366 100644
--- a/src/tests/bundles/xenial-pike-functional.yaml
+++ b/src/tests/bundles/xenial-pike-functional.yaml
@@ -8,7 +8,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/xenial/keystone
+    charm: cs:xenial/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -19,13 +19,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: xenial
   mysql:
-    charm: cs:~openstack-charmers-next/xenial/percona-cluster
+    charm: cs:xenial/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:xenial-pike'}
     series: xenial
   neutron-api:
-    charm: cs:~openstack-charmers-next/xenial/neutron-api
+    charm: cs:xenial/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -43,13 +43,13 @@ applications:
     options: {openstack-origin: 'cloud:xenial-pike'}
     series: xenial
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
+    charm: cs:xenial/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:xenial-pike'}
     series: xenial
   quagga:
-    charm: cs:~openstack-charmers-next/xenial/quagga
+    charm: cs:xenial/quagga
     num_units: 1
     options: {use-16bit-asn: True}
     series: xenial
diff --git a/src/tests/bundles/xenial-queens-functional.yaml b/src/tests/bundles/xenial-queens-functional.yaml
index 193988d..b87b41c 100644
--- a/src/tests/bundles/xenial-queens-functional.yaml
+++ b/src/tests/bundles/xenial-queens-functional.yaml
@@ -7,7 +7,7 @@ relations:
 - [neutron-api, keystone]
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/xenial/keystone
+    charm: cs:xenial/keystone
     constraints: mem=1G
     num_units: 1
     options:
@@ -18,13 +18,13 @@ applications:
         haproxy-connect-timeout: 9000
     series: xenial
   mysql:
-    charm: cs:~openstack-charmers-next/xenial/percona-cluster
+    charm: cs:xenial/percona-cluster
     constraints: mem=4G
     num_units: 1
     options: {source: 'cloud:xenial-queens'}
     series: xenial
   neutron-api:
-    charm: cs:~openstack-charmers-next/xenial/neutron-api
+    charm: cs:xenial/neutron-api
     constraints: mem=1G
     num_units: 1
     options:
@@ -42,12 +42,12 @@ applications:
     options: {openstack-origin: 'cloud:xenial-queens'}
     series: xenial
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
+    charm: cs:xenial/rabbitmq-server
     constraints: mem=1G
     num_units: 1
     options: {source: 'cloud:xenial-queens'}
     series: xenial
   quagga:
-    charm: cs:~openstack-charmers-next/xenial/quagga
+    charm: cs:xenial/quagga
     num_units: 1
     series: xenial
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 17c1230..128c6a3 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,3 +1,5 @@
 
 jinja2
 psutil
+
+git+https://opendev.org/openstack/charms.openstack.git@stable/20.02#egg=charms.openstack