diff --git a/.gitignore b/.gitignore
index 98c9c5a..b620cbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ trusty
 .testrepository
 __pycache__
 .stestr
+*.charm
diff --git a/.gitreview b/.gitreview
index 8d671a6..1379a82 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@ host=review.opendev.org
 port=29418
 project=openstack/charm-nova-cell-controller.git
 
-defaultbranch=stable/21.10
+defaultbranch=stable/wallaby
diff --git a/.zuul.yaml b/.zuul.yaml
index b3037e9..8cd637f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-wallaby-jobs
       - openstack-cover-jobs
diff --git a/build-requirements.txt b/build-requirements.txt
new file mode 100644
index 0000000..b6d2452
--- /dev/null
+++ b/build-requirements.txt
@@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..dc055bd
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,30 @@
+type: charm
+
+parts:
+  charm:
+    build-packages:
+      - tox
+      - git
+      - python3-dev
+    override-build: |
+      apt-get install ca-certificates -y
+      tox -e build-reactive
+    override-stage: |
+      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
+      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
+      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
+    override-prime: |
+      # For some reason, the normal priming chokes on the fact that there's a
+      # hooks directory.
+      cp -r $CHARMCRAFT_STAGE/* .
+
+bases:
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
new file mode 120000
index 0000000..0768683
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1 @@
+src/metadata.yaml
\ No newline at end of file
diff --git a/osci.yaml b/osci.yaml
index e380f07..7670215 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,20 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs
-    check:
-      jobs:
-      - impish-xena:
-          voting: false
-      - hirsute-wallaby
-      - groovy-victoria
-      - focal-xena:
-          voting: false
-      - focal-wallaby
-      - focal-victoria
-      - focal-ussuri
-      - bionic-ussuri
-      - bionic-train
-      - bionic-stein
+      - charm-unit-jobs-py38
+      - charm-victoria-functional-jobs
+      - charm-wallaby-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: nova-cell-controller
+      build_type: charmcraft
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..d0c35c9
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/requirements.txt b/requirements.txt
index a68620f..e182e8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # Build requirements
+pyparsing<3.0.0  # cffi needs pyparsing < 3.0.0.
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 charm-tools==2.8.3
 
diff --git a/src/build.lock b/src/build.lock
index b99660c..b1aa484 100644
--- a/src/build.lock
+++ b/src/build.lock
@@ -180,17 +180,11 @@
       "vcs": null,
       "version": "1.1.1"
     },
-    {
-      "type": "python_module",
-      "package": "Tempita",
-      "vcs": null,
-      "version": "0.4"
-    },
     {
       "type": "python_module",
       "package": "charms.openstack",
       "url": "git+https://github.com/openstack/charms.openstack.git",
-      "branch": "refs/heads/stable/21.10",
+      "branch": "stable/wallaby",
       "version": "10627ee5f991c268f174d6d100e218a0e1867af1",
       "vcs": "git"
     },
@@ -210,8 +204,8 @@
       "type": "python_module",
       "package": "charmhelpers",
       "url": "git+https://github.com/juju/charm-helpers.git",
-      "branch": "refs/heads/stable/21.10",
-      "version": "26efcd0da51d580f68ead2ca13c38f58766f8a14",
+      "branch": "stable/wallaby",
+      "version": "f8f822d5e908b1ac5694815c2d5522b6533e04f8",
       "vcs": "git"
     },
     {
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 11aa7bd..21de928 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -21,11 +21,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
-- impish
 extra-bindings:
   public:
   admin:
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index bd0c1a8..e86b74f 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -5,5 +5,9 @@
 #
 
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
-git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
+
+# Need tox to be available from tox... inception yes, but its a workaround for now
+tox
+
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index ae4c724..0000000
--- a/src/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-series: bionic
-relations:
-- - nova-cloud-controller:nova-cell-api
-  - nova-cell-controller-cell2:nova-cell-compute
-- - nova-cloud-controller:shared-db-cell
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:amqp-cell
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-compute-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server-nova:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute-cell2:image-service
-  - glance:image-service
-- - nova-cell-controller-cell2:cloud-compute
-  - nova-compute-cell2:cloud-compute
-- - nova-cloud-controller:amqp
-  - rabbitmq-server-nova:amqp
-- - nova-cell-controller-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute-cell2:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cell-controller-cell2:shared-db
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-compute-cell2:cloud-credentials
-  - keystone:identity-credentials
-- - ntp:juju-info
-  - nova-compute-cell2:juju-info
-- - ntp:juju-info
-  - neutron-gateway:juju-info
-applications:
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-      debug: true
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    series: bionic
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-rocky
-      debug: true
-  ntp:
-    charm: cs:ntp-24
-    num_units: 0
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index 0e6e01b..0000000
--- a/src/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-series: bionic
-relations:
-- - nova-cloud-controller:nova-cell-api
-  - nova-cell-controller-cell2:nova-cell-compute
-- - nova-cloud-controller:shared-db-cell
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:amqp-cell
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-compute-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server-nova:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute-cell2:image-service
-  - glance:image-service
-- - nova-cell-controller-cell2:cloud-compute
-  - nova-compute-cell2:cloud-compute
-- - nova-cloud-controller:amqp
-  - rabbitmq-server-nova:amqp
-- - nova-cell-controller-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute-cell2:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cell-controller-cell2:shared-db
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-compute-cell2:cloud-credentials
-  - keystone:identity-credentials
-- - ntp:juju-info
-  - nova-compute-cell2:juju-info
-- - ntp:juju-info
-  - neutron-gateway:juju-info
-applications:
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-      debug: true
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    series: bionic
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-stein
-      debug: true
-  ntp:
-    charm: cs:ntp-24
-    num_units: 0
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
deleted file mode 100644
index 2ffe81e..0000000
--- a/src/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-series: bionic
-relations:
-- - nova-cloud-controller:nova-cell-api
-  - nova-cell-controller-cell2:nova-cell-compute
-- - nova-cloud-controller:shared-db-cell
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:amqp-cell
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-compute-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server-nova:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute-cell2:image-service
-  - glance:image-service
-- - nova-cell-controller-cell2:cloud-compute
-  - nova-compute-cell2:cloud-compute
-- - nova-cell-controller-cell2:identity-credentials
-  - keystone:identity-credentials
-- - nova-cloud-controller:amqp
-  - rabbitmq-server-nova:amqp
-- - nova-cell-controller-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute-cell2:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cell-controller-cell2:shared-db
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-compute-cell2:cloud-credentials
-  - keystone:identity-credentials
-- - ntp:juju-info
-  - nova-compute-cell2:juju-info
-- - ntp:juju-info
-  - neutron-gateway:juju-info
-- - placement:identity-service
-  - keystone:identity-service
-- - placement:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:placement
-  - placement:placement
-applications:
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-      debug: true
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    series: bionic
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-train
-      debug: true
-  ntp:
-    charm: cs:ntp-24
-    num_units: 0
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-train
-      debug: true
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
deleted file mode 100644
index 5313182..0000000
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ /dev/null
@@ -1,163 +0,0 @@
-series: bionic
-relations:
-- - nova-cloud-controller:nova-cell-api
-  - nova-cell-controller-cell2:nova-cell-compute
-- - nova-cloud-controller:shared-db-cell
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:amqp-cell
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-compute-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:amqp-nova
-  - rabbitmq-server-nova:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server-neutron:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute-cell2:image-service
-  - glance:image-service
-- - nova-cell-controller-cell2:cloud-compute
-  - nova-compute-cell2:cloud-compute
-- - nova-cell-controller-cell2:identity-credentials
-  - keystone:identity-credentials
-- - nova-cloud-controller:amqp
-  - rabbitmq-server-nova:amqp
-- - nova-cell-controller-cell2:amqp
-  - rabbitmq-server-nova-cell2:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-compute-cell2:neutron-plugin
-  - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server-neutron:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cell-controller-cell2:shared-db
-  - mysql-cell2:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - nova-compute-cell2:cloud-credentials
-  - keystone:identity-credentials
-- - ntp:juju-info
-  - nova-compute-cell2:juju-info
-- - ntp:juju-info
-  - neutron-gateway:juju-info
-- - placement:identity-service
-  - keystone:identity-service
-- - placement:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:placement
-  - placement:placement
-applications:
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-      debug: true
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    series: bionic
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-  ntp:
-    charm: cs:ntp-24
-    num_units: 0
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
deleted file mode 100644
index c43d4a5..0000000
--- a/src/tests/bundles/focal-ussuri.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm mem=3072M
-  '4':
-    constraints: virt-type=kvm mem=3072M
-  '5':
-    constraints: virt-type=kvm mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-    constraints: mem=4096M
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '9'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '10'
-
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-    to:
-      - '11'
-
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '12'
-
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '16'
-
-relations:
-
-  - - 'nova-cloud-controller:nova-cell-api'
-    - 'nova-cell-controller-cell2:nova-cell-compute'
-
-  - - 'nova-cloud-controller:shared-db-cell'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-
-  - - 'nova-cloud-controller:amqp-cell'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-compute-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute-cell2:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cell-controller-cell2:cloud-compute'
-    - 'nova-compute-cell2:cloud-compute'
-
-  - - 'nova-cell-controller-cell2:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'nova-cell-controller-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute-cell2:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cell-controller-cell2:shared-db'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-  - - 'nova-cell-controller-cell2-mysql-router:db-router'
-    - 'mysql-innodb-cluster-cell2:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-compute-cell2:cloud-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:placement'
-    - 'placement:placement'
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index d3c6d53..67a99c7 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:focal-victoria
 
@@ -35,22 +37,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: 8.0/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +66,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: 8.0/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +77,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: 8.0/edge
 
   glance:
-    charm: cs:~openstack-charmers/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: wallaby/edge
 
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +98,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: wallaby/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +112,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: wallaby/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +123,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: wallaby/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: wallaby/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,9 +140,10 @@ applications:
       debug: true
     to:
       - '10'
+    channel: wallaby/edge
 
   nova-cell-controller-cell2:
-    charm: nova-cell-controller
+    charm: ../../../nova-cell-controller.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -138,7 +154,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +166,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: wallaby/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: 3.8/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: 3.8/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: 3.8/edge
 
   placement:
-    charm: cs:~openstack-charmers/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: wallaby/edge
 
 relations:
 
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
index 163c3e6..d9a6744 100644
--- a/src/tests/bundles/focal-wallaby.yaml
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:focal-wallaby
 
@@ -35,22 +37,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: 8.0/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +66,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: 8.0/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +77,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: 8.0/edge
 
   glance:
-    charm: cs:~openstack-charmers/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: wallaby/edge
 
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +98,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: wallaby/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +112,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: wallaby/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +123,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: wallaby/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: wallaby/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,9 +140,10 @@ applications:
       debug: true
     to:
       - '10'
+    channel: wallaby/edge
 
   nova-cell-controller-cell2:
-    charm: nova-cell-controller
+    charm: ../../../nova-cell-controller.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -138,7 +154,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +166,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: wallaby/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: 3.8/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: 3.8/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: 3.8/edge
 
   placement:
-    charm: cs:~openstack-charmers/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: wallaby/edge
 
 relations:
 
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml
deleted file mode 100644
index f94d869..0000000
--- a/src/tests/bundles/focal-xena.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm mem=3072M
-  '4':
-    constraints: virt-type=kvm mem=3072M
-  '5':
-    constraints: virt-type=kvm mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-    constraints: mem=4096M
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '9'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '10'
-
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-    to:
-      - '11'
-
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '12'
-
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '16'
-
-relations:
-
-  - - 'nova-cloud-controller:nova-cell-api'
-    - 'nova-cell-controller-cell2:nova-cell-compute'
-
-  - - 'nova-cloud-controller:shared-db-cell'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-
-  - - 'nova-cloud-controller:amqp-cell'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-compute-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute-cell2:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cell-controller-cell2:cloud-compute'
-    - 'nova-compute-cell2:cloud-compute'
-
-  - - 'nova-cell-controller-cell2:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'nova-cell-controller-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute-cell2:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cell-controller-cell2:shared-db'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-  - - 'nova-cell-controller-cell2-mysql-router:db-router'
-    - 'mysql-innodb-cluster-cell2:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-compute-cell2:cloud-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:placement'
-    - 'placement:placement'
diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml
deleted file mode 100644
index f619fe0..0000000
--- a/src/tests/bundles/groovy-victoria.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: groovy
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm mem=3072M
-  '4':
-    constraints: virt-type=kvm mem=3072M
-  '5':
-    constraints: virt-type=kvm mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-    constraints: mem=4096M
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '9'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '10'
-
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-    to:
-      - '11'
-
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '12'
-
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '16'
-
-relations:
-
-  - - 'nova-cloud-controller:nova-cell-api'
-    - 'nova-cell-controller-cell2:nova-cell-compute'
-
-  - - 'nova-cloud-controller:shared-db-cell'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-
-  - - 'nova-cloud-controller:amqp-cell'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-compute-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute-cell2:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cell-controller-cell2:cloud-compute'
-    - 'nova-compute-cell2:cloud-compute'
-
-  - - 'nova-cell-controller-cell2:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'nova-cell-controller-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute-cell2:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cell-controller-cell2:shared-db'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-  - - 'nova-cell-controller-cell2-mysql-router:db-router'
-    - 'mysql-innodb-cluster-cell2:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-compute-cell2:cloud-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:placement'
-    - 'placement:placement'
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
deleted file mode 100644
index 4da766c..0000000
--- a/src/tests/bundles/hirsute-wallaby.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm mem=3072M
-  '4':
-    constraints: virt-type=kvm mem=3072M
-  '5':
-    constraints: virt-type=kvm mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-    constraints: mem=4096M
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '9'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '10'
-
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-    to:
-      - '11'
-
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '12'
-
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '16'
-
-relations:
-
-  - - 'nova-cloud-controller:nova-cell-api'
-    - 'nova-cell-controller-cell2:nova-cell-compute'
-
-  - - 'nova-cloud-controller:shared-db-cell'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-
-  - - 'nova-cloud-controller:amqp-cell'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-compute-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute-cell2:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cell-controller-cell2:cloud-compute'
-    - 'nova-compute-cell2:cloud-compute'
-
-  - - 'nova-cell-controller-cell2:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'nova-cell-controller-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute-cell2:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cell-controller-cell2:shared-db'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-  - - 'nova-cell-controller-cell2-mysql-router:db-router'
-    - 'mysql-innodb-cluster-cell2:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-compute-cell2:cloud-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:placement'
-    - 'placement:placement'
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
deleted file mode 100644
index 92638ee..0000000
--- a/src/tests/bundles/impish-xena.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: impish
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm mem=3072M
-  '4':
-    constraints: virt-type=kvm mem=3072M
-  '5':
-    constraints: virt-type=kvm mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-    constraints: mem=4096M
-  '13':
-  '14':
-  '15':
-  '16':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '9'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-    to:
-      - '10'
-
-  nova-cell-controller-cell2:
-    charm: nova-cell-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-      debug: true
-      cell-name: "cell2"
-    to:
-      - '11'
-
-  nova-compute-cell2:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '12'
-
-  rabbitmq-server-nova:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '16'
-
-relations:
-
-  - - 'nova-cloud-controller:nova-cell-api'
-    - 'nova-cell-controller-cell2:nova-cell-compute'
-
-  - - 'nova-cloud-controller:shared-db-cell'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-
-  - - 'nova-cloud-controller:amqp-cell'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-compute-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:amqp-nova'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'neutron-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute-cell2:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cell-controller-cell2:cloud-compute'
-    - 'nova-compute-cell2:cloud-compute'
-
-  - - 'nova-cell-controller-cell2:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server-nova:amqp'
-
-  - - 'nova-cell-controller-cell2:amqp'
-    - 'rabbitmq-server-nova-cell2:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute-cell2:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server-neutron:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cell-controller-cell2:shared-db'
-    - 'nova-cell-controller-cell2-mysql-router:shared-db'
-  - - 'nova-cell-controller-cell2-mysql-router:db-router'
-    - 'mysql-innodb-cluster-cell2:db-router'
-
-  - - 'nova-cloud-controller:neutron-api'
-    - 'neutron-api:neutron-api'
-
-  - - 'nova-compute-cell2:cloud-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:placement'
-    - 'placement:placement'
diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
deleted file mode 100644
index f239dd8..0000000
--- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-
-applications:
-  nova-cell-controller-cell2:
-    charm: {{ charm_location }}
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index e1adb13..a64eace 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -11,23 +11,13 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 gate_bundles:
-  - hirsute-wallaby
   - focal-wallaby
   - focal-victoria
-  - focal-ussuri
-  - bionic-ussuri
-  - bionic-train
-  - bionic-stein
 
-dev_bundles:
-  - groovy-victoria
-  - focal-xena
-  - bionic-rocky
+dev_bundles: []
 
 smoke_bundles:
-  - bionic-train
+  - focal-wallaby
 
 tests_options:
-  force_deploy:
-    - groovy-victoria
-    - impish-xena
+  force_deploy: []
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index f7c2efa..497ffe9 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,4 +1,4 @@
 
-git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
 
-git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers
+git+https://github.com/juju/charm-helpers@stable/wallaby#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 4afbb28..2325b90 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,7 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+pyparsing<3.0.0  # cffi needs pyparsing < 3.0.0.
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
@@ -34,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
 
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/wallaby#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 #
diff --git a/tox.ini b/tox.ini
index 22159df..e22fe48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
+allowlist_externals =
+    charmcraft
+    bash
+    tox
+    rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
 basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:build-reactive]
+basepython = python3
 commands =
     charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
 
@@ -55,32 +68,44 @@ basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py35]
-basepython = python3.5
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
 [testenv:py36]
 basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
 [testenv:py38]
 basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
        charm-tools==2.8.3
 commands = flake8 {posargs} src unit_tests
 
+[testenv:func-target]
+# Hack to get functional tests working in the charmcraft
+# world. We should fix this.
+basepython = python3
+passenv = HOME TERM CS_* OS_* TEST_*
+deps = -r{toxinidir}/src/test-requirements.txt
+changedir = {toxinidir}/src
+commands =
+  bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi"
+  tox --version
+  tox -e func-target {posargs}
+
 [testenv:cover]
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini