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 7d727da..3337267 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,50 +1,20 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
       - charm-yoga-functional-jobs
       # Non-voting due to:
       # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1952763
       # - charm-xena-functional-jobs
       # - charm-wallaby-functional-jobs
-      # Non-voting due to:
-      # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1935022
-      # - charm-victoria-functional-jobs
-      # - charm-ussuri-functional-jobs
-      # Non-voting due to:
-      # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1952798
-      # - charm-stein-functional-jobs
     check:
       jobs:
-      - bionic-ussuri
-      # Non-voting due to:
-      # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1952798
-      - bionic-stein:
-          voting: false
-      # Non-voting due to:
-      # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1935022
-      - focal-ussuri:
-          voting: false
-      - ganesha-focal-ussuri-non-ha:
-          voting: false
-      - focal-victoria:
-          voting: false
       # Non-voting due to:
       # https://bugs.launchpad.net/charm-manila-ganesha/+bug/1952763
-      - focal-wallaby:
-          voting: false
       - focal-xena:
           voting: false
-      - hirsute-wallaby:
-          voting: false
       - impish-xena:
           voting: false
     vars:
       needs_charm_build: true
       charm_build_name: manila-ganesha
-- job:
-    name: ganesha-focal-ussuri-non-ha
-    parent: focal-ussuri
-    dependencies:
-      - focal-ussuri
-    vars:
-      tox_extra_args: focal-ussuri-non-ha
diff --git a/src/metadata.yaml b/src/metadata.yaml
index ec977dc..81ea7c2 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,10 +10,7 @@ tags:
 - storage
 - file-servers
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: false
 extra-bindings:
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index 54c51a2..0000000
--- a/src/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,148 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-rocky
-services:
-  manila-ganesha-az1:
-    num_units: 3
-    series: bionic
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    # charm: cs:~openstack-charmers-next/manila
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  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: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha-az1
-  - - manila-ganesha-az1
-    - percona-cluster
-  - - manila-ganesha-az1
-    - rabbitmq-server
-  - - manila-ganesha-az1
-    - keystone
-  - - manila
-    - manila-ganesha-az1
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index d1eba5c..0000000
--- a/src/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,148 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-stein
-services:
-  manila-ganesha-az1:
-    num_units: 3
-    series: bionic
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    # charm: cs:~openstack-charmers-next/manila
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  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: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha-az1
-  - - manila-ganesha-az1
-    - percona-cluster
-  - - manila-ganesha-az1
-    - rabbitmq-server
-  - - manila-ganesha-az1
-    - keystone
-  - - manila
-    - manila-ganesha-az1
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
deleted file mode 100644
index c1888f7..0000000
--- a/src/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-train
-services:
-  manila-ganesha-az1:
-    num_units: 3
-    series: bionic
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    # charm: cs:~openstack-charmers-next/manila
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  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: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha-az1
-  - - manila-ganesha-az1
-    - percona-cluster
-  - - manila-ganesha-az1
-    - rabbitmq-server
-  - - manila-ganesha-az1
-    - keystone
-  - - manila
-    - manila-ganesha-az1
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'placement:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
deleted file mode 100644
index 70bb508..0000000
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ /dev/null
@@ -1,163 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-ussuri
-services:
-  manila-ganesha-az1:
-    num_units: 3
-    series: bionic
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    # charm: cs:~openstack-charmers-next/manila
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  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: *source
-  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: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha-az1
-  - - manila-ganesha-az1
-    - percona-cluster
-  - - manila-ganesha-az1
-    - rabbitmq-server
-  - - manila-ganesha-az1
-    - keystone
-  - - manila
-    - manila-ganesha-az1
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'placement:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/focal-ussuri-non-ha.yaml b/src/tests/bundles/focal-ussuri-non-ha.yaml
deleted file mode 100644
index fd3707a..0000000
--- a/src/tests/bundles/focal-ussuri-non-ha.yaml
+++ /dev/null
@@ -1,309 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: false
-
-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':
-  '12':
-  '13':
-  '14':
-  '15':
-    constraints: mem=8G
-  '16':
-    constraints: mem=8G
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-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
-  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'
-
-  manila-ganesha:
-    num_units: 1
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-
-  manila:
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-      - '16'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-
-  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
-    to:
-      - '18'
-
-  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: *openstack-origin
-    to:
-      - '19'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '20'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-
-relations:
-
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
deleted file mode 100644
index 52221ad..0000000
--- a/src/tests/bundles/focal-ussuri.yaml
+++ /dev/null
@@ -1,311 +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':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-    constraints: mem=8G
-  '18':
-    constraints: mem=8G
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-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
-  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'
-
-  manila-ganesha-az1:
-    num_units: 3
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-      - '13'
-
-  manila:
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-      - '18'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  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
-    to:
-      - '20'
-
-  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: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-relations:
-
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha-az1'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha-az1'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha-az1'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha-az1'
-
-  - - 'manila-ganesha-az1:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
deleted file mode 100644
index f7c21af..0000000
--- a/src/tests/bundles/focal-victoria.yaml
+++ /dev/null
@@ -1,311 +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':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-    constraints: mem=8G
-  '18':
-    constraints: mem=8G
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-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
-  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'
-
-  manila-ganesha-az1:
-    num_units: 3
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-      - '13'
-
-  manila:
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-      - '18'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  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
-    to:
-      - '20'
-
-  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: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-relations:
-
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha-az1'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha-az1'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha-az1'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha-az1'
-
-  - - 'manila-ganesha-az1:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
deleted file mode 100644
index f2ee4b1..0000000
--- a/src/tests/bundles/focal-wallaby.yaml
+++ /dev/null
@@ -1,311 +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':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-    constraints: mem=8G
-  '18':
-    constraints: mem=8G
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-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
-  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'
-
-  manila-ganesha-az1:
-    num_units: 3
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-      - '13'
-
-  manila:
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-      - '18'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  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
-    to:
-      - '20'
-
-  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: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-relations:
-
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha-az1'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha-az1'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha-az1'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha-az1'
-
-  - - 'manila-ganesha-az1:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml
index f964697..1cac7d3 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/focal-xena.yaml
@@ -39,22 +39,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   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
   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
   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
@@ -62,6 +69,7 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha-az1:
     num_units: 3
@@ -74,7 +82,7 @@ services:
       - '5'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -82,9 +90,10 @@ services:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -94,18 +103,20 @@ services:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '12'
       - '13'
+    channel: latest/edge
 
   manila:
-    charm: cs:~openstack-charmers-next/manila
+    charm: ch:manila
     num_units: 1
     options:
       default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    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
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     options:
       config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
     to:
       - '17'
       - '18'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    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
@@ -163,34 +179,39 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '20'
+    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:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
index 9b53f3e..0af79a8 100644
--- a/src/tests/bundles/focal-yoga.yaml
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -39,22 +39,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   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
   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
   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
@@ -62,6 +69,7 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha-az1:
     num_units: 3
@@ -74,7 +82,7 @@ services:
       - '5'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -82,9 +90,10 @@ services:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -94,18 +103,20 @@ services:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '12'
       - '13'
+    channel: latest/edge
 
   manila:
-    charm: cs:~openstack-charmers-next/manila
+    charm: ch:manila
     num_units: 1
     options:
       default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    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
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     options:
       config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
     to:
       - '17'
       - '18'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    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
@@ -163,34 +179,39 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '20'
+    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:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    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 1c6935a..0000000
--- a/src/tests/bundles/hirsute-wallaby.yaml
+++ /dev/null
@@ -1,311 +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':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-    constraints: mem=8G
-  '18':
-    constraints: mem=8G
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-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
-  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'
-
-  manila-ganesha-az1:
-    num_units: 3
-    charm: ../../../manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-      - '13'
-
-  manila:
-    charm: cs:~openstack-charmers-next/manila
-    num_units: 1
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-      - '18'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  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
-    to:
-      - '20'
-
-  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: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-relations:
-
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha-az1'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha-az1'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha-az1'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha-az1'
-
-  - - 'manila-ganesha-az1:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
index c6ba2c5..d83c350 100644
--- a/src/tests/bundles/impish-xena.yaml
+++ b/src/tests/bundles/impish-xena.yaml
@@ -39,22 +39,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   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
   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
   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
@@ -62,6 +69,7 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha-az1:
     num_units: 3
@@ -74,7 +82,7 @@ services:
       - '5'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -82,9 +90,10 @@ services:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -94,18 +103,20 @@ services:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '12'
       - '13'
+    channel: latest/edge
 
   manila:
-    charm: cs:~openstack-charmers-next/manila
+    charm: ch:manila
     num_units: 1
     options:
       default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    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
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     options:
       config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
     to:
       - '17'
       - '18'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    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
@@ -163,34 +179,39 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '20'
+    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:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
index 5941e37..5f3b339 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -39,22 +39,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   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
   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
   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
@@ -62,6 +69,7 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha-az1:
     num_units: 3
@@ -74,7 +82,7 @@ services:
       - '5'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -82,9 +90,10 @@ services:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -94,18 +103,20 @@ services:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '12'
       - '13'
+    channel: latest/edge
 
   manila:
-    charm: cs:~openstack-charmers-next/manila
+    charm: ch:manila
     num_units: 1
     options:
       default-share-backend: cephfsnfs1
@@ -113,26 +124,29 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    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
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     options:
       config-flags: default_ephemeral_format=ext4
@@ -143,17 +157,19 @@ services:
     to:
       - '17'
       - '18'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    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
@@ -163,34 +179,39 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '20'
+    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:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
 relations:
 
diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
index 6d1ea38..b99e41a 100644
--- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -5,8 +5,9 @@ applications:
       vip: '{{ OS_VIP00 }}'
       debug: True
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
   manila:
     options:
       debug: True
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 8dbeceb..57dd220 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,19 +1,21 @@
 charm_name: manila-ganesha
+
 gate_bundles:
-- focal-ussuri
-- focal-victoria
-- focal-wallaby
 - focal-xena
-- hirsute-wallaby
 - impish-xena
+
 dev_bundles:
 - focal-yoga
 - jammy-yoga
+
 smoke_bundles:
-- focal-ussuri
+- focal-xena
+
 target_deploy_status: {}
+
 tests:
   - zaza.openstack.charm_tests.manila_ganesha.tests.ManilaGaneshaTests
+
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
@@ -21,8 +23,8 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
   - zaza.openstack.charm_tests.manila_ganesha.setup.setup_ganesha_share_type
+
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga