diff --git a/.zuul.yaml b/.zuul.yaml
index fd20909..a01ad92 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: manila
diff --git a/charmcraft.yaml b/charmcraft.yaml
index fc8d0b4..060fd2f 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -20,36 +20,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 337f33c..bfda00b 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: manila
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/stable
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..d0c35c9
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/src/config.yaml b/src/config.yaml
index 32cc561..4d68843 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 f5f0f4b..ce3be32 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,8 +10,6 @@ description: |
   data from your instances to and from your file system.
 tags:
   - openstack
-series:
-  - jammy
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index 16da884..0000000
--- a/src/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,341 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-local_overlay_enabled: False
-
-series: jammy
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  manila-ganesha-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  manila-ganesha:
-    num_units: 1
-    charm: ch:manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-    channel: reef/edge
-
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  manila:
-    charm: ../../../manila_ubuntu-22.04-amd64.charm
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '22'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-    channel: 2024.1/edge
-
-  nrpe:
-    charm: ch:nrpe
-    channel: latest/edge
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
deleted file mode 100644
index a2609b0..0000000
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ /dev/null
@@ -1,341 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-local_overlay_enabled: False
-
-series: jammy
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  manila-ganesha-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  manila-ganesha:
-    num_units: 1
-    charm: ch:manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-    channel: reef/edge
-
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  manila:
-    charm: ../../../manila_ubuntu-22.04-amd64.charm
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '22'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-    channel: 2024.1/edge
-
-  nrpe:
-    charm: ch:nrpe
-    channel: latest/edge
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'
diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml
deleted file mode 100644
index 93fcc70..0000000
--- a/src/tests/bundles/jammy-caracal.yaml
+++ /dev/null
@@ -1,341 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-local_overlay_enabled: False
-
-series: jammy
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  manila-ganesha-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-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
-
-  manila-ganesha:
-    num_units: 1
-    charm: ch:manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-    channel: reef/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-    channel: reef/edge
-
-  ceph-fs:
-    charm: ch:ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-    channel: reef/edge
-
-  manila:
-    charm: ../../../manila_ubuntu-22.04-amd64.charm
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '22'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-    channel: 2024.1/edge
-
-  nrpe:
-    charm: ch:nrpe
-    channel: latest/edge
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'
diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml
index bff87b7..e065d33 100644
--- a/src/tests/bundles/noble-caracal.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -81,7 +81,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -92,7 +92,7 @@ services:
       - '4'
       - '5'
       - '6'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -105,7 +105,7 @@ services:
       - '7'
       - '8'
       - '9'
-    channel: reef/edge
+    channel: latest/edge
 
   ceph-fs:
     charm: ch:ceph-fs
@@ -115,10 +115,10 @@ services:
     to:
       - '10'
       - '11'
-    channel: reef/edge
+    channel: latest/edge
 
   manila:
-    charm: ../../../manila_ubuntu-22.04-amd64.charm
+    charm: ../../../manila.charm
     num_units: 3
     options:
       default-share-backend: cephfsnfs1
@@ -137,7 +137,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '15'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -153,7 +153,7 @@ services:
     to:
       - '16'
       - '17'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   glance:
     charm: ch:glance
@@ -162,7 +162,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '18'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -175,11 +175,11 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '19'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -189,7 +189,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '20'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -198,7 +198,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '21'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -214,7 +214,7 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '23'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   nrpe:
     charm: ch:nrpe
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 9eddd8c..2a39ffb 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,13 +1,11 @@
 charm_name: manila
 
 gate_bundles:
-  - jammy-antelope
-  - jammy-bobcat
-  - jammy-caracal
+  - noble-caracal
 dev_bundles:
   - noble-caracal
 smoke_bundles:
-  - jammy-caracal
+  - noble-caracal
 target_deploy_status:
   nrpe:
     workload-status: blocked
diff --git a/src/tox.ini b/src/tox.ini
index fefd94b..a794240 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -26,7 +26,7 @@ passenv =
           OS_*
           TEST_*
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
diff --git a/tox.ini b/tox.ini
index 30c5840..fb2fcb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ allowlist_externals =
     charmcraft
     bash
     tox
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
@@ -45,6 +46,7 @@ basepython = python3
 commands =
     charmcraft clean
     charmcraft -v pack
+    {toxinidir}/rename.sh
     charmcraft clean
 
 [testenv:build-reactive]
@@ -60,14 +62,14 @@ commands =
 [testenv:py3]
 basepython = python3
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:py310]
 basepython = python3.10
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
@@ -82,7 +84,7 @@ commands = flake8 {posargs} src unit_tests
 # https://github.com/openstack/nova/blob/master/tox.ini
 basepython = python3
 deps =
-    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
     -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 setenv =