diff --git a/charmcraft.yaml b/charmcraft.yaml
index fbd9c9c..33e7604 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -5,27 +5,31 @@ parts:
     plugin: dump
     source: .
     prime:
-      - actions/*
-      - charmhelpers/*
-      - files/*
-      - hooks/*
-      - lib/*
-      - templates/*
-      - config.yaml
-      - copyright
-      - icon.svg
-      - LICENSE
-      - Makefile
-      - metadata.yaml
-      - README.md
+    - actions/*
+    - charmhelpers/*
+    - files/*
+    - hooks/*
+    - lib/*
+    - templates/*
+    - config.yaml
+    - copyright
+    - icon.svg
+    - LICENSE
+    - Makefile
+    - metadata.yaml
+    - README.md
 
-bases:
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures:
-          - amd64
-    run-on:
-      - 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/charmhelpers/core/host_factory/ubuntu.py b/charmhelpers/core/host_factory/ubuntu.py
index 732d76c..e87595e 100644
--- a/charmhelpers/core/host_factory/ubuntu.py
+++ b/charmhelpers/core/host_factory/ubuntu.py
@@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
     'kinetic',
     'lunar',
     'mantic',
+    'noble',
+    'oracular',
 )
 
 
diff --git a/config.yaml b/config.yaml
index ce1469e..ece09ed 100644
--- a/config.yaml
+++ b/config.yaml
@@ -57,7 +57,6 @@ options:
     description: |
       Optionally specify an existing rbd pool that cinder should map to.
   rbd-flatten-volume-from-snapshot:
-    default:
     type: boolean
     default: False
     description: |
diff --git a/osci.yaml b/osci.yaml
index 3fb10a4..80dd722 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -4,18 +4,15 @@
       - charm-functional-jobs
     check:
       jobs:
-      - jammy-antelope-ec_cinder-ceph
-      - jammy-bobcat-ec_cinder-ceph
-      - mantic-bobcat-ec_cinder-ceph:
-          voting: false
+      - noble-caracal-ec_cinder-ceph
     vars:
       needs_charm_build: true
       charm_build_name: cinder-ceph
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/beta
 
 - job:
-    name: jammy-antelope-ec_cinder-ceph
+    name: noble-caracal-ec_cinder-ceph
     parent: func-target
     dependencies:
       - charm-build
@@ -23,18 +20,4 @@
       - name: tox-py310
         soft: true
     vars:
-      tox_extra_args: '-- jammy-antelope-ec'
-- job:
-    name: jammy-bobcat-ec_cinder-ceph
-    parent: func-target
-    dependencies:
-      - jammy-antelope-ec_cinder-ceph
-    vars:
-      tox_extra_args: '-- jammy-bobcat-ec'
-- job:
-    name: mantic-bobcat-ec_cinder-ceph
-    parent: func-target
-    dependencies:
-      - jammy-antelope-ec_cinder-ceph
-    vars:
-      tox_extra_args: '-- mantic-bobcat-ec'
+      tox_extra_args: '-- noble-caracal-ec'
diff --git a/tests/bundles/jammy-antelope-ec.yaml b/tests/bundles/jammy-antelope-ec.yaml
deleted file mode 100644
index 2d01aef..0000000
--- a/tests/bundles/jammy-antelope-ec.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-series: &series jammy
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-  18:
-  19:
-  20:
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '18'
-      - '19'
-      - '20'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-    options:
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - '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'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index 10cf56d..0000000
--- a/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-series: &series jammy
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - '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'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml
deleted file mode 100644
index cadb15d..0000000
--- a/tests/bundles/jammy-bobcat.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-series: &series jammy
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - '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'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/jammy-caracal.yaml
deleted file mode 100644
index 9acf97a..0000000
--- a/tests/bundles/jammy-caracal.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-series: &series jammy
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: reef/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: reef/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: 2024.1/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: 2024.1/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - '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'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/bundles/jammy-bobcat-ec.yaml b/tests/bundles/noble-caracal-ec.yaml
similarity index 94%
rename from tests/bundles/jammy-bobcat-ec.yaml
rename to tests/bundles/noble-caracal-ec.yaml
index 9d1038b..5fa06a5 100644
--- a/tests/bundles/jammy-bobcat-ec.yaml
+++ b/tests/bundles/noble-caracal-ec.yaml
@@ -1,7 +1,7 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
+  openstack-origin: &openstack-origin caracal
 
-series: &series jammy
+series: &series noble
 
 machines:
   0:
@@ -75,7 +75,7 @@ applications:
       - '18'
       - '19'
       - '20'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -87,7 +87,7 @@ applications:
       - '6'
       - '7'
       - '8'
-    channel: reef/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -105,7 +105,7 @@ applications:
       debug: true
     to:
       - '10'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   placement:
     charm: ch:placement
@@ -115,7 +115,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -128,7 +128,7 @@ applications:
       neutron-security-groups: true
     to:
       - '12'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -137,7 +137,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -147,7 +147,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '14'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   glance:
     charm: ch:glance
@@ -156,11 +156,11 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '15'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder:
     charm: ch:cinder
@@ -171,7 +171,7 @@ applications:
       glance-api-version: 2
     to:
       - '16'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder-ceph:
     charm: ../../cinder-ceph.charm
@@ -193,7 +193,7 @@ applications:
       debug: true
     to:
       - '17'
-    channel: 2024.1/edge
+    channel: latest/edge
 
 relations:
 
diff --git a/tests/bundles/noble-caracal.yaml b/tests/bundles/noble-caracal.yaml
index 8ac250a..1de5b2c 100644
--- a/tests/bundles/noble-caracal.yaml
+++ b/tests/bundles/noble-caracal.yaml
@@ -69,7 +69,7 @@ applications:
       - '3'
       - '4'
       - '5'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -81,7 +81,7 @@ applications:
       - '6'
       - '7'
       - '8'
-    channel: reef/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -99,7 +99,7 @@ applications:
       debug: true
     to:
       - '10'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   placement:
     charm: ch:placement
@@ -109,7 +109,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -122,7 +122,7 @@ applications:
       neutron-security-groups: true
     to:
       - '12'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -131,7 +131,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -141,7 +141,7 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '14'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   glance:
     charm: ch:glance
@@ -150,11 +150,11 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '15'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder:
     charm: ch:cinder
@@ -165,7 +165,7 @@ applications:
       glance-api-version: 2
     to:
       - '16'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   cinder-ceph:
     charm: ../../cinder-ceph.charm
@@ -183,7 +183,7 @@ applications:
       debug: true
     to:
       - '17'
-    channel: 2024.1/edge
+    channel: latest/edge
 
 relations:
 
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 2a5f408..f23479f 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -5,11 +5,9 @@ comment: |
   cinder and ceph-mon zaza charm tests.
 
 smoke_bundles:
-  - jammy-caracal
+  - noble-caracal
 gate_bundles:
-  - jammy-antelope
-  - jammy-bobcat
-  - jammy-caracal
+  - noble-caracal
 dev_bundles:
   - noble-caracal
 configure:
@@ -34,5 +32,3 @@ tests:
 tests_options:
   policyd:
     service: cinder
-  force_deploy:
-    - noble-caracal