diff --git a/.zuul.yaml b/.zuul.yaml
index fd20909..03813d0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,3 +2,8 @@
     templates:
       - openstack-python3-charm-jobs
       - openstack-cover-jobs
+    check:
+      jobs:
+        - charmbuild
+    vars:
+      charm_build_name: ironic-conductor
diff --git a/charmcraft.yaml b/charmcraft.yaml
index bf03322..30ea7ed 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -21,36 +21,18 @@ parts:
     build-environment:
       - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
       - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
-bases:
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [amd64]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [amd64]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [s390x]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [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 5dc798a..0b6f713 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: ironic-conductor
       build_type: charmcraft
-      charmcraft_channel: 2.x/edge
+      charmcraft_channel: 3.x/edge
diff --git a/src/config.yaml b/src/config.yaml
index 45244e4..fe8acc0 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,6 +1,6 @@
 options:
   openstack-origin:
-    default: bobcat
+    default: caracal
     type: string
     description: |
       Repository from which to install. May be one of the following:
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 99bd482..80e99f6 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -12,10 +12,6 @@ description: |
 tags:
 - openstack
 - baremetal
-series:
-- jammy
-- lunar
-- mantic
 extra-bindings:
   deployment:
   cleaning:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index debdaff..0000000
--- a/src/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,305 +0,0 @@
-local_overlay_enabled: False
-
-options:
-  source: &source cloud:jammy-antelope
-series: jammy
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-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
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-conductor-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    channel: latest/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-    channel: latest/edge
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-    channel: latest/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  nova-ironic:
-    charm: ch:nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-    channel: latest/edge
-  hacluster-ironic:
-    charm: ch:hacluster
-    num_units: 0
-    channel: latest/edge
-  ironic-api:
-    charm: ch:ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-      hardware-enablement-options: |
-        [ipmi]
-        debug = true
-  neutron-ironic-agent:
-    charm: ch:neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
deleted file mode 100644
index 4e14f27..0000000
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ /dev/null
@@ -1,305 +0,0 @@
-local_overlay_enabled: False
-
-options:
-  source: &source cloud:jammy-bobcat
-series: jammy
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-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
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-conductor-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    channel: latest/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-    channel: latest/edge
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-    channel: latest/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  nova-ironic:
-    charm: ch:nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-    channel: latest/edge
-  hacluster-ironic:
-    charm: ch:hacluster
-    num_units: 0
-    channel: latest/edge
-  ironic-api:
-    charm: ch:ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-      hardware-enablement-options: |
-        [ipmi]
-        debug = true
-  neutron-ironic-agent:
-    charm: ch:neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml
deleted file mode 100644
index 0dfe8d4..0000000
--- a/src/tests/bundles/mantic-bobcat.yaml
+++ /dev/null
@@ -1,305 +0,0 @@
-local_overlay_enabled: False
-
-options:
-  source: &source distro
-series: mantic
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-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
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-conductor-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    channel: latest/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-    channel: latest/edge
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-    channel: latest/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  nova-ironic:
-    charm: ch:nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-    channel: latest/edge
-  hacluster-ironic:
-    charm: ch:hacluster
-    num_units: 0
-    channel: latest/edge
-  ironic-api:
-    charm: ch:ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-23.10-amd64.charm
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-      hardware-enablement-options: |
-        [ipmi]
-        debug = true
-  neutron-ironic-agent:
-    charm: ch:neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml
similarity index 98%
rename from src/tests/bundles/lunar-antelope.yaml
rename to src/tests/bundles/noble-caracal.yaml
index 4b1f3e7..c92f4bd 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -1,8 +1,8 @@
 local_overlay_enabled: False
 
 options:
-  source: &source distro
-series: lunar
+  source: &source cloud:noble-caracal
+series: noble
 relations:
 - - nova-ironic
   - ironic-api
@@ -281,7 +281,7 @@ services:
       openstack-origin: *source
     channel: latest/edge
   ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-23.04-amd64.charm
+    charm: ../../../ironic-conductor_amd64.charm
     num_units: 1
     constraints: mem=2G
     options:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 81e63c8..0f06493 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,15 +4,13 @@
 charm_name: ironic-api
 
 gate_bundles:
-- jammy-antelope
+- noble-caracal
 
 dev_bundles:
-- jammy-bobcat
-- lunar-antelope
-- mantic-bobcat
+- noble-caracal
 
 smoke_bundles:
-  - jammy-antelope
+  - noble-caracal
 
 target_deploy_status:
   vault:
@@ -39,5 +37,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - lunar-antelope
-    - mantic-bobcat
+    - noble-caracal