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 f5b441e..84a3fc3 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,11 +1,9 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
-      - charm-yoga-functional-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
       - charm-xena-functional-jobs
-      - charm-wallaby-functional-jobs
-      - charm-victoria-functional-jobs
-      - charm-ussuri-functional-jobs
+      - charm-yoga-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: placement
diff --git a/src/metadata.yaml b/src/metadata.yaml
index d18e23a..6d462d2 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,10 +10,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: false
 requires:
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
deleted file mode 100644
index 05d184b..0000000
--- a/src/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-series: bionic
-relations:
-- [ keystone, mysql ]
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- [ nova-cloud-controller, glance ]
-- [ nova-cloud-controller, keystone ]
-- [ nova-compute, nova-cloud-controller ]
-- - nova-compute
-  - rabbitmq-server:amqp
-- [ nova-compute, glance ]
-- [ glance, mysql ]
-- [ glance, keystone ]
-- [ glance, rabbitmq-server ]
-- [ neutron-gateway, nova-cloud-controller ]
-- [ "neutron-gateway:amqp", rabbitmq-server ]
-- [ neutron-api, mysql ]
-- [ neutron-api, rabbitmq-server ]
-- [ neutron-api, nova-cloud-controller ]
-- [ neutron-api, neutron-openvswitch ]
-- [ neutron-api, keystone ]
-- [ neutron-api, neutron-gateway ]
-- [ neutron-openvswitch, nova-compute ]
-- [ neutron-openvswitch, rabbitmq-server ]
-- [ placement, mysql ]
-- [ placement, keystone ]
-- [ placement, nova-cloud-controller ]
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-applications:
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-train
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-train
-  mysql:
-    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
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-train
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-train
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-train
-      debug: true
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-train
-      debug: true
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
deleted file mode 100644
index d5fbe55..0000000
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-series: bionic
-relations:
-- [ keystone, mysql ]
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- [ nova-cloud-controller, glance ]
-- [ nova-cloud-controller, keystone ]
-- [ nova-compute, nova-cloud-controller ]
-- - nova-compute
-  - rabbitmq-server:amqp
-- [ nova-compute, glance ]
-- [ glance, mysql ]
-- [ glance, keystone ]
-- [ glance, rabbitmq-server ]
-- [ neutron-gateway, nova-cloud-controller ]
-- [ "neutron-gateway:amqp", rabbitmq-server ]
-- [ neutron-api, mysql ]
-- [ neutron-api, rabbitmq-server ]
-- [ neutron-api, nova-cloud-controller ]
-- [ neutron-api, neutron-openvswitch ]
-- [ neutron-api, keystone ]
-- [ neutron-api, neutron-gateway ]
-- [ neutron-openvswitch, nova-compute ]
-- [ neutron-openvswitch, rabbitmq-server ]
-- [ placement, mysql ]
-- [ placement, keystone ]
-- [ placement, nova-cloud-controller ]
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-applications:
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-ussuri
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: cloud:bionic-ussuri
-  mysql:
-    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
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: cloud:bionic-ussuri
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
deleted file mode 100644
index 37d45b4..0000000
--- a/src/tests/bundles/focal-ussuri.yaml
+++ /dev/null
@@ -1,239 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: focal
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '6'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '7'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '8'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      openstack-origin: *openstack-origin
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      debug: true
-    to:
-      - '9'
-
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '10'
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '11'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller'
-    - 'glance'
-
-  - - 'nova-cloud-controller'
-    - 'keystone'
-
-  - - 'nova-compute'
-    - 'nova-cloud-controller'
-
-  - - 'nova-compute'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute'
-    - 'glance'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance'
-    - 'keystone'
-
-  - - 'glance'
-    - 'rabbitmq-server'
-
-  - - 'neutron-gateway'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-api'
-    - 'neutron-openvswitch'
-
-  - - 'neutron-api'
-    - 'keystone'
-
-  - - 'neutron-api'
-    - 'neutron-gateway'
-
-  - - 'neutron-openvswitch'
-    - 'nova-compute'
-
-  - - 'neutron-openvswitch'
-    - 'rabbitmq-server'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-  - - 'vault:certificates'
-    - 'placement:certificates'
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-  - - 'vault:certificates'
-    - 'glance:certificates'
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
deleted file mode 100644
index bb17780..0000000
--- a/src/tests/bundles/focal-victoria.yaml
+++ /dev/null
@@ -1,239 +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: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '6'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '7'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '8'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      openstack-origin: *openstack-origin
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      debug: true
-    to:
-      - '9'
-
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '10'
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '11'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller'
-    - 'glance'
-
-  - - 'nova-cloud-controller'
-    - 'keystone'
-
-  - - 'nova-compute'
-    - 'nova-cloud-controller'
-
-  - - 'nova-compute'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute'
-    - 'glance'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance'
-    - 'keystone'
-
-  - - 'glance'
-    - 'rabbitmq-server'
-
-  - - 'neutron-gateway'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-api'
-    - 'neutron-openvswitch'
-
-  - - 'neutron-api'
-    - 'keystone'
-
-  - - 'neutron-api'
-    - 'neutron-gateway'
-
-  - - 'neutron-openvswitch'
-    - 'nova-compute'
-
-  - - 'neutron-openvswitch'
-    - 'rabbitmq-server'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-  - - 'vault:certificates'
-    - 'placement:certificates'
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-  - - 'vault:certificates'
-    - 'glance:certificates'
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
deleted file mode 100644
index 039f5df..0000000
--- a/src/tests/bundles/focal-wallaby.yaml
+++ /dev/null
@@ -1,239 +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: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '6'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '7'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '8'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      openstack-origin: *openstack-origin
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      debug: true
-    to:
-      - '9'
-
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '10'
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '11'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller'
-    - 'glance'
-
-  - - 'nova-cloud-controller'
-    - 'keystone'
-
-  - - 'nova-compute'
-    - 'nova-cloud-controller'
-
-  - - 'nova-compute'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute'
-    - 'glance'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance'
-    - 'keystone'
-
-  - - 'glance'
-    - 'rabbitmq-server'
-
-  - - 'neutron-gateway'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-api'
-    - 'neutron-openvswitch'
-
-  - - 'neutron-api'
-    - 'keystone'
-
-  - - 'neutron-api'
-    - 'neutron-gateway'
-
-  - - 'neutron-openvswitch'
-    - 'nova-compute'
-
-  - - 'neutron-openvswitch'
-    - 'rabbitmq-server'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-  - - 'vault:certificates'
-    - 'placement:certificates'
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-  - - 'vault:certificates'
-    - 'glance:certificates'
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml
index fdecb3e..004875a 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/focal-xena.yaml
@@ -26,20 +26,26 @@ machines:
 applications:
 
   keystone-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
   glance-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
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-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
@@ -47,36 +53,40 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1G
     options:
       source: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -86,21 +96,24 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -108,9 +121,10 @@ applications:
       debug: true
     to:
       - '8'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=4G
     options:
@@ -121,6 +135,7 @@ applications:
       debug: true
     to:
       - '9'
+    channel: latest/edge
 
   placement:
     charm: ../../../placement
@@ -134,9 +149,10 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '11'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
index 0e1afed..1785dea 100644
--- a/src/tests/bundles/focal-yoga.yaml
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -26,20 +26,26 @@ machines:
 applications:
 
   keystone-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
   glance-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
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-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
@@ -47,36 +53,40 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1G
     options:
       source: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -86,21 +96,24 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -108,9 +121,10 @@ applications:
       debug: true
     to:
       - '8'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=4G
     options:
@@ -121,6 +135,7 @@ applications:
       debug: true
     to:
       - '9'
+    channel: latest/edge
 
   placement:
     charm: ../../../placement
@@ -134,9 +149,10 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '11'
+    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 5b50cf5..0000000
--- a/src/tests/bundles/hirsute-wallaby.yaml
+++ /dev/null
@@ -1,239 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=1G
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '5'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '6'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '7'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '8'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=4G
-    options:
-      openstack-origin: *openstack-origin
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      debug: true
-    to:
-      - '9'
-
-  placement:
-    charm: ../../../placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '10'
-
-  vault:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
-    to:
-      - '11'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller'
-    - 'glance'
-
-  - - 'nova-cloud-controller'
-    - 'keystone'
-
-  - - 'nova-compute'
-    - 'nova-cloud-controller'
-
-  - - 'nova-compute'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute'
-    - 'glance'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance'
-    - 'keystone'
-
-  - - 'glance'
-    - 'rabbitmq-server'
-
-  - - 'neutron-gateway'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api'
-    - 'rabbitmq-server'
-
-  - - 'neutron-api'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-api'
-    - 'neutron-openvswitch'
-
-  - - 'neutron-api'
-    - 'keystone'
-
-  - - 'neutron-api'
-    - 'neutron-gateway'
-
-  - - 'neutron-openvswitch'
-    - 'nova-compute'
-
-  - - 'neutron-openvswitch'
-    - 'rabbitmq-server'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-  - - 'vault:certificates'
-    - 'placement:certificates'
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-  - - 'vault:certificates'
-    - 'glance:certificates'
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
index e4fe153..91602c4 100644
--- a/src/tests/bundles/impish-xena.yaml
+++ b/src/tests/bundles/impish-xena.yaml
@@ -26,20 +26,26 @@ machines:
 applications:
 
   keystone-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
   glance-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
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-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
@@ -47,36 +53,40 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1G
     options:
       source: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -86,21 +96,24 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -108,9 +121,10 @@ applications:
       debug: true
     to:
       - '8'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=4G
     options:
@@ -121,6 +135,7 @@ applications:
       debug: true
     to:
       - '9'
+    channel: latest/edge
 
   placement:
     charm: ../../../placement
@@ -134,9 +149,10 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '11'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
index d988557..31ebefa 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -26,20 +26,26 @@ machines:
 applications:
 
   keystone-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
   glance-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
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-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
@@ -47,36 +53,40 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=1G
     options:
       source: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '5'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -86,21 +96,24 @@ applications:
       neutron-security-groups: true
     to:
       - '6'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       bridge-mappings: physnet1:br-ex
     to:
       - '7'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -108,9 +121,10 @@ applications:
       debug: true
     to:
       - '8'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=4G
     options:
@@ -121,6 +135,7 @@ applications:
       debug: true
     to:
       - '9'
+    channel: latest/edge
 
   placement:
     charm: ../../../placement
@@ -134,9 +149,10 @@ applications:
 
   vault:
     num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     to:
       - '11'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 18e55bd..98b32a7 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -17,24 +17,17 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 gate_bundles:
-  - bionic-ussuri
-  - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
   - focal-xena
-  - hirsute-wallaby
   - impish-xena
 
 smoke_bundles:
-  - focal-ussuri
+  - focal-xena
 
 dev_bundles:
-  - bionic-train
   - focal-yoga
   - jammy-yoga
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga