diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 00000000..ba84f314
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,27 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64
diff --git a/metadata.yaml b/metadata.yaml
index aba2b7dc..893dd385 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,10 +11,7 @@ tags:
 - storage
 - misc
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 extra-bindings:
   public:
diff --git a/osci.yaml b/osci.yaml
index 250f726f..0258ca3c 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,70 +1,44 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
     check:
       jobs:
-      - ceph-focal-ussuri
-      - bionic-queens
-      - bionic-stein
-      - bionic-train
-      - bionic-ussuri
-      - ceph-focal-victoria
-      - ceph-focal-wallaby
       - ceph-focal-xena
       - ceph-focal-yoga:
           voting: false
-      - ceph-hirsute-wallaby
       - ceph-impish-xena:
           voting: false
       - ceph-jammy-yoga:
           voting: false
 
-- job:
-    name: ceph-focal-ussuri
-    parent: func-target
-    dependencies: &smoke-jobs
-      - bionic-ussuri
-    vars:
-      tox_extra_args: ceph:focal-ussuri
-- job:
-    name: ceph-focal-victoria
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ceph:focal-victoria
-- job:
-    name: ceph-focal-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ceph:focal-wallaby
 - job:
     name: ceph-focal-xena
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - osci-lint
+      - tox-py38
+      - tox-py39
     vars:
       tox_extra_args: ceph:focal-xena
 - job:
     name: ceph-focal-yoga
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ceph-focal-xena
     vars:
       tox_extra_args: ceph:focal-yoga
-- job:
-    name: ceph-hirsute-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ceph:hirsute-wallaby
 - job:
     name: ceph-impish-xena
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ceph-focal-xena
     vars:
       tox_extra_args: ceph:impish-xena
 - job:
     name: ceph-jammy-yoga
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ceph-focal-xena
     vars:
       tox_extra_args: ceph:jammy-yoga
diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
deleted file mode 100644
index 3cc8ace1..00000000
--- a/tests/bundles/bionic-queens.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["glance:shared-db", "mysql:shared-db"]
-  - ["glance:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-      - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    to:
-      - '2'
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index 3f833ebf..00000000
--- a/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["glance:shared-db", "mysql:shared-db"]
-  - ["glance:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-    - '2'
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index c16db07c..00000000
--- a/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["glance:shared-db", "mysql:shared-db"]
-  - ["glance:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-      - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-    - '2'
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
deleted file mode 100644
index e33ad39a..00000000
--- a/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["glance:shared-db", "mysql:shared-db"]
-  - ["glance:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-      - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-    to:
-    - '2'
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
deleted file mode 100644
index 21e32944..00000000
--- a/tests/bundles/bionic-ussuri.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-    constraints: mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["glance:shared-db", "mysql:shared-db"]
-  - ["glance:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-      - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-    to:
-    - '2'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
deleted file mode 100644
index cc1b734d..00000000
--- a/tests/bundles/focal-ussuri.yaml
+++ /dev/null
@@ -1,138 +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':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
deleted file mode 100644
index dd3d8943..00000000
--- a/tests/bundles/focal-victoria.yaml
+++ /dev/null
@@ -1,138 +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':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
deleted file mode 100644
index 020df27d..00000000
--- a/tests/bundles/focal-wallaby.yaml
+++ /dev/null
@@ -1,138 +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':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml
index 9f88ff7d..77aab83d 100644
--- a/tests/bundles/focal-xena.yaml
+++ b/tests/bundles/focal-xena.yaml
@@ -29,12 +29,14 @@ machines:
 applications:
 
   keystone-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
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -42,9 +44,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 6
     storage:
       osd-devices: '10G'
@@ -57,17 +60,19 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -76,27 +81,30 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '12'
+    channel: latest/edge
 
   keystone:
     expose: True
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   glance:
     expose: True
-    charm: cs:~openstack-charmers-next/glance
+    charm: ../../../glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml
index 72cb591f..8b9f4a71 100644
--- a/tests/bundles/focal-yoga.yaml
+++ b/tests/bundles/focal-yoga.yaml
@@ -29,12 +29,14 @@ machines:
 applications:
 
   keystone-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
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -42,9 +44,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 6
     storage:
       osd-devices: '10G'
@@ -57,17 +60,19 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -76,27 +81,30 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '12'
+    channel: latest/edge
 
   keystone:
     expose: True
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   glance:
     expose: True
-    charm: cs:~openstack-charmers-next/glance
+    charm: ../../../glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml
deleted file mode 100644
index 7c859783..00000000
--- a/tests/bundles/hirsute-wallaby.yaml
+++ /dev/null
@@ -1,138 +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':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '15'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '12'
-
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      ec-profile-plugin: jerasure
-    to:
-      - '14'
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceph-radosgw:object-store'
-    - 'glance:object-store'
diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml
index 1c9aa450..76bbd959 100644
--- a/tests/bundles/impish-xena.yaml
+++ b/tests/bundles/impish-xena.yaml
@@ -29,12 +29,14 @@ machines:
 applications:
 
   keystone-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
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -42,9 +44,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 6
     storage:
       osd-devices: '10G'
@@ -57,17 +60,19 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -76,27 +81,30 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '12'
+    channel: latest/edge
 
   keystone:
     expose: True
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   glance:
     expose: True
-    charm: cs:~openstack-charmers-next/glance
+    charm: ../../../glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml
index edb23291..6018ea41 100644
--- a/tests/bundles/jammy-yoga.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@@ -29,12 +29,14 @@ machines:
 applications:
 
   keystone-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
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -42,9 +44,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 6
     storage:
       osd-devices: '10G'
@@ -57,17 +60,19 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -76,27 +81,30 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '12'
+    channel: latest/edge
 
   keystone:
     expose: True
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   glance:
     expose: True
-    charm: cs:~openstack-charmers-next/glance
+    charm: ../../../glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 1372432d..fba60b94 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,35 +2,22 @@ charm_name: glance
 
 comment:
   - 'the glance configure job validates operation of identity-service relation'
-  - 'we do testing on Ceph by default from focal-ussuri and onwards'
 
 smoke_bundles:
-  - full_run: focal-ussuri
+  - focal-xena
+
 gate_bundles:
-  - bionic-queens
-  - bionic-stein
-  - bionic-ussuri
-  - ceph: focal-ussuri
-  - ceph: focal-victoria
-  - ceph: focal-wallaby
-  - ceph: focal-xena
-  - ceph: hirsute-wallaby
-  - ceph: impish-xena
+  - focal-xena
+  - impish-xena
 
 dev_bundles:
-  - bionic-rocky
-  - bionic-train
-  - full_run: bionic-train
-  - ceph: focal-yoga
-  - ceph: jammy-yoga
+  - focal-yoga
+  - jammy-yoga
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
+  - zaza.openstack.charm_tests.glance.setup.configure_external_s3_backend
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
-  - ceph:
-    - zaza.openstack.charm_tests.glance.setup.add_lts_image
-    - zaza.openstack.charm_tests.glance.setup.configure_external_s3_backend
-    - zaza.openstack.charm_tests.keystone.setup.add_demo_user
   - full_run:
     - zaza.openstack.charm_tests.glance.setup.add_cirros_image
     - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
@@ -38,15 +25,12 @@ configure:
     - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
 
 tests:
-  - ceph:
-    - zaza.openstack.charm_tests.glance.tests.GlanceTest
-    - zaza.openstack.charm_tests.glance.tests.GlanceCephRGWBackendTest
-    - zaza.openstack.charm_tests.glance.tests.GlanceExternalS3Test
-    - zaza.openstack.charm_tests.policyd.tests.GlanceTests
-    - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
-    - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
   - zaza.openstack.charm_tests.glance.tests.GlanceTest
+  - zaza.openstack.charm_tests.glance.tests.GlanceCephRGWBackendTest
+  - zaza.openstack.charm_tests.glance.tests.GlanceExternalS3Test
   - zaza.openstack.charm_tests.policyd.tests.GlanceTests
+  - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes
+  - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
   - full_run:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
     - zaza.openstack.charm_tests.glance.tests.GlanceTest
@@ -59,6 +43,5 @@ tests_options:
   policyd:
     service: glance
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga