diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..a850351
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,13 @@
+type: charm
+
+parts:
+  charm:
+    source: src/
+    plugin: reactive
+    build-snaps: [charm]
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64
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 9f1f819..55d0e27 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,14 +1,11 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
-      - charm-yoga-functional-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
       # focal-xena fails due to:
       # https://bugs.launchpad.net/charm-nova-cell-controller/+bug/1951874
       # - charm-xena-functional-jobs
-      - charm-wallaby-functional-jobs
-      - charm-victoria-functional-jobs
-      - charm-ussuri-functional-jobs
-      - charm-stein-functional-jobs
+      - charm-yoga-functional-jobs
     check:
       jobs:
         # focal-xena fails due to:
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 11aa7bd..9212c82 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -21,10 +21,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 extra-bindings:
   public:
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index 4e5d1f9..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-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-rocky
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/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 955a208..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-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-stein
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/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 661bae1..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-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-train
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  placement:
-    charm: cs:~openstack-charmers-next/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 024f78d..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-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-ussuri
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  mysql-cell2:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  placement:
-    charm: cs:~openstack-charmers-next/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 922a0c9..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-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/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
deleted file mode 100644
index 8d6a979..0000000
--- a/src/tests/bundles/focal-victoria.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-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-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/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-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
deleted file mode 100644
index 155c6d9..0000000
--- a/src/tests/bundles/focal-wallaby.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-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-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/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-xena.yaml b/src/tests/bundles/focal-xena.yaml
index f82c5cf..454bdd5 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/focal-xena.yaml
@@ -35,22 +35,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +64,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +75,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +96,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +110,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +121,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,6 +138,7 @@ applications:
       debug: true
     to:
       - '10'
+    channel: latest/edge
 
   nova-cell-controller-cell2:
     charm: nova-cell-controller
@@ -138,7 +152,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +164,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: latest/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: latest/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
index 5b249a8..ae272f4 100644
--- a/src/tests/bundles/focal-yoga.yaml
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -35,22 +35,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +64,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +75,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +96,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +110,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +121,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,6 +138,7 @@ applications:
       debug: true
     to:
       - '10'
+    channel: latest/edge
 
   nova-cell-controller-cell2:
     charm: nova-cell-controller
@@ -138,7 +152,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +164,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: latest/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: latest/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
deleted file mode 100644
index b6188fb..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-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-    options:
-      base-port: 3316
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-      worker-multiplier: 0.25
-    to:
-      - '7'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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-next/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-next/neutron-openvswitch
-    num_units: 0
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/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-next/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-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '13'
-
-  rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '14'
-
-  rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/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
index 1ef782b..a8399a7 100644
--- a/src/tests/bundles/impish-xena.yaml
+++ b/src/tests/bundles/impish-xena.yaml
@@ -35,22 +35,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +64,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +75,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +96,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +110,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +121,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,6 +138,7 @@ applications:
       debug: true
     to:
       - '10'
+    channel: latest/edge
 
   nova-cell-controller-cell2:
     charm: nova-cell-controller
@@ -138,7 +152,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +164,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: latest/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: latest/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
index 5c4838d..020c935 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -35,22 +35,28 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   nova-cell-controller-cell2-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
     options:
       base-port: 3316
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -58,9 +64,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   mysql-innodb-cluster-cell2:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,18 +75,20 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       worker-multiplier: 0.25
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       admin-password: openstack
@@ -87,9 +96,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '7'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -100,9 +110,10 @@ applications:
       worker-multiplier: 0.25
     to:
       - '8'
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
@@ -110,13 +121,15 @@ applications:
       worker-multiplier: 0.25
     to:
       - '9'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -125,6 +138,7 @@ applications:
       debug: true
     to:
       - '10'
+    channel: latest/edge
 
   nova-cell-controller-cell2:
     charm: nova-cell-controller
@@ -138,7 +152,7 @@ applications:
       - '11'
 
   nova-compute-cell2:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     storage:
       ephemeral-device: '40G'
@@ -150,33 +164,38 @@ applications:
       debug: true
     to:
       - '12'
+    channel: latest/edge
 
   rabbitmq-server-nova:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
   rabbitmq-server-nova-cell2:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '14'
+    channel: latest/edge
 
   rabbitmq-server-neutron:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: true
     to:
       - '16'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 97e07d9..314a290 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -11,26 +11,17 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 gate_bundles:
-  - bionic-stein
-  - bionic-ussuri
-  - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
   - focal-xena
-  - hirsute-wallaby
   - impish-xena
 
 dev_bundles:
-  - bionic-rocky
-  - bionic-train
   - focal-yoga
   - jammy-yoga
 
 smoke_bundles:
-  - bionic-train
+  - focal-xena
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga