diff --git a/.zuul.yaml b/.zuul.yaml
index 7ffc71c..70eb689 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,3 +2,6 @@
     templates:
       - openstack-python3-charm-yoga-jobs
       - openstack-cover-jobs
+    vars:
+      juju_channel: 2.9/stable
+
diff --git a/charmcraft.yaml b/charmcraft.yaml
index bea920d..7217725 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -19,16 +19,17 @@ parts:
       apt install -y ca-certificates
       update-ca-certificates
 
-bases:
-  - build-on:
-      - name: ubuntu
-        channel: "20.04"
-        architectures:
-          - amd64
-    run-on:
-      - name: ubuntu
-        channel: "20.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
+base: ubuntu@24.04
+platforms:
+  amd64:
+    build-on: amd64
+    build-for: amd64
+  arm64:
+    build-on: arm64
+    build-for: arm64
+  ppc64el:
+    build-on: ppc64el
+    build-for: ppc64el
+  s390x:
+    build-on: s390x
+    build-for: s390x
diff --git a/osci.yaml b/osci.yaml
index 92e3793..2e78e25 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,10 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
       - charm-unit-jobs-py310
       - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: ceph-dashboard
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/beta
diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml
deleted file mode 100644
index 7d7d1bf..0000000
--- a/tests/bundles/focal-yoga.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-local_overlay_enabled: False
-series: focal
-variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
-applications:
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G,2'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    channel: quincy/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    channel: quincy/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    channel: 1.8/stable
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    constraints: mem=3072M
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: 8.0/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-  ceph-dashboard:
-    charm: ../../ceph-dashboard.charm
-    options:
-      public-hostname: 'ceph-dashboard.zaza.local'
-  prometheus:
-    charm: ch:prometheus2
-    num_units: 1
-  grafana:
-    # SSL and allow_embedding are not released into cs:grafana yet, due 
-    # October 2021
-    charm: ch:grafana
-    num_units: 1
-    options:
-      anonymous: True
-      install_method: snap
-      allow_embedding: True
-  telegraf:
-    charm: telegraf
-    channel: stable
-    options:
-       hostname: "{host}"
-  prometheus-alertmanager:
-    charm: ch:prometheus-alertmanager
-    num_units: 1
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: quincy/edge
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 1
-    options:
-      source: *openstack-origin
-    channel: quincy/edge
-  ceph-iscsi:
-    charm: ch:ceph-iscsi
-    num_units: 2
-    options:
-      source: *openstack-origin
-      gateway-metadata-pool: iscsi-foo-metadata
-    channel: quincy/edge
-relations:
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'ceph-dashboard:dashboard'
-    - 'ceph-mon:dashboard'
-  - - 'ceph-dashboard:certificates'
-    - 'vault:certificates'
-  - - 'ceph-mon:prometheus'
-    - 'prometheus:target'
-  - - 'grafana:grafana-source'
-    - 'prometheus:grafana-source'
-  - - 'grafana:certificates'
-    - 'vault:certificates'
-  - - 'ceph-osd:juju-info'
-    - 'telegraf:juju-info'
-  - - 'ceph-mon:juju-info'
-    - 'telegraf:juju-info'
-  - - 'telegraf:prometheus-client'
-    - 'prometheus:target'
-  - - 'telegraf:dashboards'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:grafana-dashboard'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-dashboard:prometheus'
-    - 'prometheus:website'
-  - - 'prometheus:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:certificates'
-    - 'vault:certificates'
-  - - 'ceph-dashboard:radosgw-dashboard'
-    - 'ceph-radosgw:radosgw-user'
-  - - 'ceph-mon:mds'
-    - 'ceph-fs:ceph-mds'
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-dashboard:iscsi-dashboard'
-    - 'ceph-iscsi:admin-access'
diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml
deleted file mode 100644
index fedc701..0000000
--- a/tests/bundles/focal.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-local_overlay_enabled: False
-series: focal
-applications:
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G,2'
-    options:
-      osd-devices: '/dev/test-non-existent'
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-    channel: latest/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    channel: 1.8/stable
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    constraints: mem=3072M
-    num_units: 3
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ceph-dashboard:
-    charm: ../../ceph-dashboard.charm
-    options:
-      public-hostname: 'ceph-dashboard.zaza.local'
-  prometheus:
-    charm: cs:prometheus2
-    num_units: 1
-  grafana:
-    # SSL and allow_embedding are not released into cs:grafana yet, due 
-    # Octrober 2021
-    charm: ch:grafana
-    num_units: 1
-    options:
-      anonymous: True
-      install_method: snap
-      allow_embedding: True
-  telegraf:
-    charm: telegraf
-    channel: stable
-    options:
-       hostname: "{host}"
-  prometheus-alertmanager:
-    charm: cs:prometheus-alertmanager
-    num_units: 1
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 3
-    channel: latest/edge
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 1
-    channel: latest/edge
-  ceph-iscsi:
-    charm: ch:ceph-iscsi
-    num_units: 2
-    options:
-      gateway-metadata-pool: iscsi-foo-metadata
-    channel: latest/edge
-relations:
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'ceph-dashboard:dashboard'
-    - 'ceph-mon:dashboard'
-  - - 'ceph-dashboard:certificates'
-    - 'vault:certificates'
-  - - 'ceph-mon:prometheus'
-    - 'prometheus:target'
-  - - 'grafana:grafana-source'
-    - 'prometheus:grafana-source'
-  - - 'grafana:certificates'
-    - 'vault:certificates'
-  - - 'ceph-osd:juju-info'
-    - 'telegraf:juju-info'
-  - - 'ceph-mon:juju-info'
-    - 'telegraf:juju-info'
-  - - 'telegraf:prometheus-client'
-    - 'prometheus:target'
-  - - 'telegraf:dashboards'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:grafana-dashboard'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-dashboard:prometheus'
-    - 'prometheus:website'
-  - - 'prometheus:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:certificates'
-    - 'vault:certificates'
-  - - 'ceph-dashboard:radosgw-dashboard'
-    - 'ceph-radosgw:radosgw-user'
-  - - 'ceph-mon:mds'
-    - 'ceph-fs:ceph-mds'
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-dashboard:iscsi-dashboard'
-    - 'ceph-iscsi:admin-access'
diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index b2497e9..0000000
--- a/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-local_overlay_enabled: False
-series: jammy
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-applications:
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G,2'
-    options:
-      osd-devices: '/dev/test-non-existent'
-    channel: quincy/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-    channel: quincy/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    channel: 1.8/stable
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    constraints: mem=3072M
-    num_units: 3
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ceph-dashboard:
-    charm: ../../ceph-dashboard.charm
-    options:
-      public-hostname: 'ceph-dashboard.zaza.local'
-  prometheus:
-    charm: ch:prometheus2
-    num_units: 1
-  grafana:
-    # SSL and allow_embedding are not released into cs:grafana yet, due 
-    # October 2021
-    charm: ch:grafana
-    series: focal
-    channel: latest/stable
-    num_units: 1
-    options:
-      anonymous: True
-      install_method: snap
-      allow_embedding: True
-  telegraf:
-    charm: telegraf
-    channel: stable
-    options:
-       hostname: "{host}"
-  prometheus-alertmanager:
-    charm: ch:prometheus-alertmanager
-    series: focal
-    num_units: 1
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 3
-    channel: quincy/edge
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 1
-    channel: quincy/edge
-  ceph-iscsi:
-    charm: ch:ceph-iscsi
-    num_units: 2
-    options:
-      gateway-metadata-pool: iscsi-foo-metadata
-    channel: quincy/edge
-relations:
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'ceph-dashboard:dashboard'
-    - 'ceph-mon:dashboard'
-  - - 'ceph-dashboard:certificates'
-    - 'vault:certificates'
-  - - 'ceph-mon:prometheus'
-    - 'prometheus:target'
-  - - 'grafana:grafana-source'
-    - 'prometheus:grafana-source'
-  - - 'grafana:certificates'
-    - 'vault:certificates'
-  - - 'ceph-osd:juju-info'
-    - 'telegraf:juju-info'
-  - - 'ceph-mon:juju-info'
-    - 'telegraf:juju-info'
-  - - 'telegraf:prometheus-client'
-    - 'prometheus:target'
-  - - 'telegraf:dashboards'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:grafana-dashboard'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-dashboard:prometheus'
-    - 'prometheus:website'
-  - - 'prometheus:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:certificates'
-    - 'vault:certificates'
-  - - 'ceph-dashboard:radosgw-dashboard'
-    - 'ceph-radosgw:radosgw-user'
-  - - 'ceph-mon:mds'
-    - 'ceph-fs:ceph-mds'
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-dashboard:iscsi-dashboard'
-    - 'ceph-iscsi:admin-access'
diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml
deleted file mode 100644
index 35bb4fe..0000000
--- a/tests/bundles/jammy-bobcat.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-local_overlay_enabled: False
-series: jammy
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-applications:
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G,2'
-    options:
-      osd-devices: '/dev/test-non-existent'
-    channel: reef/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-    channel: reef/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    channel: 1.8/stable
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    constraints: mem=3072M
-    num_units: 3
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ceph-dashboard:
-    charm: ../../ceph-dashboard.charm
-    options:
-      public-hostname: 'ceph-dashboard.zaza.local'
-  prometheus:
-    charm: ch:prometheus2
-    num_units: 1
-  grafana:
-    # SSL and allow_embedding are not released into cs:grafana yet, due 
-    # October 2021
-    charm: ch:grafana
-    num_units: 1
-    series: focal
-    channel: latest/stable
-    options:
-      anonymous: True
-      install_method: snap
-      allow_embedding: True
-  telegraf:
-    charm: telegraf
-    channel: stable
-    options:
-       hostname: "{host}"
-  prometheus-alertmanager:
-    charm: ch:prometheus-alertmanager
-    series: focal
-    num_units: 1
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 3
-    channel: reef/edge
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 1
-    channel: reef/edge
-  ceph-iscsi:
-    charm: ch:ceph-iscsi
-    num_units: 2
-    options:
-      gateway-metadata-pool: iscsi-foo-metadata
-    channel: reef/edge
-relations:
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'ceph-dashboard:dashboard'
-    - 'ceph-mon:dashboard'
-  - - 'ceph-dashboard:certificates'
-    - 'vault:certificates'
-  - - 'ceph-mon:prometheus'
-    - 'prometheus:target'
-  - - 'grafana:grafana-source'
-    - 'prometheus:grafana-source'
-  - - 'grafana:certificates'
-    - 'vault:certificates'
-  - - 'ceph-osd:juju-info'
-    - 'telegraf:juju-info'
-  - - 'ceph-mon:juju-info'
-    - 'telegraf:juju-info'
-  - - 'telegraf:prometheus-client'
-    - 'prometheus:target'
-  - - 'telegraf:dashboards'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:grafana-dashboard'
-    - 'grafana:dashboards'
-  - - 'ceph-dashboard:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-dashboard:prometheus'
-    - 'prometheus:website'
-  - - 'prometheus:alertmanager-service'
-    - 'prometheus-alertmanager:alertmanager-service'
-  - - 'ceph-radosgw:mon'
-    - 'ceph-mon:radosgw'
-  - - 'ceph-radosgw:certificates'
-    - 'vault:certificates'
-  - - 'ceph-dashboard:radosgw-dashboard'
-    - 'ceph-radosgw:radosgw-user'
-  - - 'ceph-mon:mds'
-    - 'ceph-fs:ceph-mds'
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-dashboard:iscsi-dashboard'
-    - 'ceph-iscsi:admin-access'
diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/noble-caracal.yaml
similarity index 96%
rename from tests/bundles/jammy-caracal.yaml
rename to tests/bundles/noble-caracal.yaml
index 1ce3e1e..46956d3 100644
--- a/tests/bundles/jammy-caracal.yaml
+++ b/tests/bundles/noble-caracal.yaml
@@ -1,7 +1,7 @@
 local_overlay_enabled: False
-series: jammy
+series: noble
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
+  openstack-origin: &openstack-origin distro
   source: &source distro
 applications:
   ceph-osd:
@@ -23,7 +23,7 @@ applications:
   vault:
     num_units: 1
     charm: ch:vault
-    channel: 1.8/stable
+    channel: latest/edge
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     constraints: mem=3072M
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8852f62..d33bd59 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,11 +1,8 @@
 charm_name: ceph-dasboard
 gate_bundles:
-  - focal
-  - jammy
-  - jammy-bobcat
-  - jammy-caracal
+  - noble-caracal
 smoke_bundles:
-  - focal
+  - noble-caracal
 configure:
   - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
   - zaza.openstack.charm_tests.ceph.dashboard.setup.check_dashboard_cert