diff --git a/.zuul.yaml b/.zuul.yaml
index af4b7f3..c26719c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,8 @@
 - project:
     templates:
       - openstack-python3-charm-jobs
+    check:
+      jobs:
+        - charmbuild
+    vars:
+      charm_build_name: keystone-saml-mellon
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 173c464..f1c38cf 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -23,36 +23,17 @@ 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 feff130..7c9e026 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: keystone-saml-mellon
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 3.x/stable
diff --git a/src/metadata.yaml b/src/metadata.yaml
index c04097d..618b2ad 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -19,8 +19,6 @@ tags:
   - identity
   - federation
   - idP
-series:
-  - jammy
 provides:
   keystone-fid-service-provider:
     interface: keystone-fid-service-provider
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index 4a490c0..0000000
--- a/src/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,396 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-local_overlay_enabled: True
-
-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':
-  '17':
-  '18':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  openstack-dashboard-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-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
-
-  cinder:
-    num_units: 1
-    charm: ch:cinder
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-    to:
-      - '5'
-      - '6'
-      - '7'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '8'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '9'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-    to:
-      - '11'
-      - '12'
-    channel: 2024.1/edge
-
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-      - '14'
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  vault:
-    num_units: 1
-    charm: ch:vault
-    to:
-      - '17'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  keystone-saml-mellon1:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #1"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp1:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      auth-user-name: 'user1'
-      auth-user-password: 'userpass1'
-
-  keystone-saml-mellon2:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #2"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp2:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      auth-user-name: 'user2'
-      auth-user-password: 'userpass2'
-
-  keystone-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-  openstack-dashboard-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - '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-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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: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'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone'
-    - 'keystone-saml-mellon1'
-  - - 'keystone'
-    - 'keystone-saml-mellon2'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'openstack-dashboard:certificates'
-
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon1'
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon2'
-
-  - - 'keystone:websso-trusted-dashboard'
-    - 'openstack-dashboard:websso-trusted-dashboard'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - "keystone:ha"
-    - "keystone-hacluster:ha"
-  - - "openstack-dashboard:ha"
-    - "openstack-dashboard-hacluster:ha"
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
deleted file mode 100644
index ffd8a51..0000000
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ /dev/null
@@ -1,396 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-local_overlay_enabled: True
-
-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':
-  '17':
-  '18':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  openstack-dashboard-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-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
-
-  cinder:
-    num_units: 1
-    charm: ch:cinder
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-    to:
-      - '5'
-      - '6'
-      - '7'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '8'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '9'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-    to:
-      - '11'
-      - '12'
-    channel: 2024.1/edge
-
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-      - '14'
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  vault:
-    num_units: 1
-    charm: ch:vault
-    to:
-      - '17'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  keystone-saml-mellon1:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #1"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp1:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      auth-user-name: 'user1'
-      auth-user-password: 'userpass1'
-
-  keystone-saml-mellon2:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #2"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp2:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      auth-user-name: 'user2'
-      auth-user-password: 'userpass2'
-
-  keystone-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-  openstack-dashboard-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - '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-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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: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'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone'
-    - 'keystone-saml-mellon1'
-  - - 'keystone'
-    - 'keystone-saml-mellon2'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'openstack-dashboard:certificates'
-
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon1'
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon2'
-
-  - - 'keystone:websso-trusted-dashboard'
-    - 'openstack-dashboard:websso-trusted-dashboard'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - "keystone:ha"
-    - "keystone-hacluster:ha"
-  - - "openstack-dashboard:ha"
-    - "openstack-dashboard-hacluster:ha"
diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml
deleted file mode 100644
index d732e44..0000000
--- a/src/tests/bundles/jammy-caracal.yaml
+++ /dev/null
@@ -1,396 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-local_overlay_enabled: True
-
-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':
-  '17':
-  '18':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  openstack-dashboard-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-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
-
-  cinder:
-    num_units: 1
-    charm: ch:cinder
-    options:
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-      block-device: None
-    to:
-      - '3'
-    channel: 2024.1/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-    channel: 2024.1/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-    to:
-      - '5'
-      - '6'
-      - '7'
-    channel: 2024.1/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      manage-neutron-plugin-legacy-mode: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '8'
-    channel: 2024.1/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '9'
-    channel: 2024.1/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    channel: 2024.1/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-    to:
-      - '10'
-    channel: 2024.1/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-    to:
-      - '11'
-      - '12'
-    channel: 2024.1/edge
-
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-      - '14'
-      - '15'
-    channel: 2024.1/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '16'
-    channel: latest/edge
-
-  vault:
-    num_units: 1
-    charm: ch:vault
-    to:
-      - '17'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-    channel: 2024.1/edge
-
-  keystone-saml-mellon1:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #1"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp1:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp1'
-      protocol-name: 'mapped'
-      auth-user-name: 'user1'
-      auth-user-password: 'userpass1'
-
-  keystone-saml-mellon2:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
-    num_units: 0
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      user-facing-name: "Test SAML IDP #2"
-      subject-confirmation-data-address-check: False
-      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-
-  test-saml-idp2:
-    charm: ch:ionutbalutoiu-test-saml-idp
-    series: focal
-    num_units: 1
-    options:
-      idp-name: 'test-saml-idp2'
-      protocol-name: 'mapped'
-      auth-user-name: 'user2'
-      auth-user-password: 'userpass2'
-
-  keystone-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-  openstack-dashboard-hacluster:
-    charm: ch:hacluster
-    num_units: 0
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-    channel: latest/edge
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-openvswitch:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - '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-gateway:neutron-plugin-api'
-    - 'neutron-api:neutron-plugin-api'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - '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: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'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone'
-    - 'keystone-saml-mellon1'
-  - - 'keystone'
-    - 'keystone-saml-mellon2'
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'vault:certificates'
-    - 'keystone:certificates'
-
-  - - 'vault:certificates'
-    - 'glance:certificates'
-
-  - - 'vault:certificates'
-    - 'openstack-dashboard:certificates'
-
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon1'
-  - - 'openstack-dashboard'
-    - 'keystone-saml-mellon2'
-
-  - - 'keystone:websso-trusted-dashboard'
-    - 'openstack-dashboard:websso-trusted-dashboard'
-
-  - - 'vault:certificates'
-    - 'cinder:certificates'
-
-  - - 'vault:certificates'
-    - 'neutron-api:certificates'
-
-  - - 'vault:certificates'
-    - 'nova-cloud-controller:certificates'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'vault:certificates'
-    - 'placement:certificates'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - "keystone:ha"
-    - "keystone-hacluster:ha"
-  - - "openstack-dashboard:ha"
-    - "openstack-dashboard-hacluster:ha"
diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml
index 118058e..d67073b 100644
--- a/src/tests/bundles/noble-caracal.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -1,4 +1,4 @@
-variables:
+ariables:
   openstack-origin: &openstack-origin distro
 
 local_overlay_enabled: True
@@ -78,7 +78,7 @@ applications:
       block-device: None
     to:
       - '3'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   glance:
     charm: ch:glance
@@ -87,7 +87,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '4'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone:
     charm: ch:keystone
@@ -99,7 +99,7 @@ applications:
       - '5'
       - '6'
       - '7'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -111,7 +111,7 @@ applications:
       neutron-security-groups: true
     to:
       - '8'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-gateway:
     charm: ch:neutron-gateway
@@ -121,12 +121,12 @@ applications:
       bridge-mappings: physnet1:br-ex
     to:
       - '9'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
     num_units: 0
-    channel: 2024.1/edge
+    channel: latest/edge
 
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
@@ -136,7 +136,7 @@ applications:
       network-manager: Neutron
     to:
       - '10'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -150,7 +150,7 @@ applications:
     to:
       - '11'
       - '12'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   openstack-dashboard:
     charm: ch:openstack-dashboard
@@ -161,7 +161,7 @@ applications:
       - '13'
       - '14'
       - '15'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
@@ -184,10 +184,10 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '18'
-    channel: 2024.1/edge
+    channel: latest/edge
 
   keystone-saml-mellon1:
-    charm: ../../../keystone-saml-mellon_ubuntu-22.04-amd64.charm
+    charm: ../../../keystone-saml-mellon_amd64.charm
     num_units: 0
     options:
       idp-name: 'test-saml-idp1'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 50726e0..17fa0c7 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,11 +1,9 @@
 charm_name: keystone-saml-mellon
 
 smoke_bundles:
-  - jammy-caracal
+  - noble-caracal
 gate_bundles:
-  - jammy-antelope
-  - jammy-bobcat
-  - jammy-caracal
+  - noble-caracal
 dev_bundles:
   - noble-caracal
 configure:
diff --git a/src/tox.ini b/src/tox.ini
index 2ddcccd..3ce5e85 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 3e2072b..79bce84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,21 +60,21 @@ 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}
 
 [testenv:py312]
 basepython = python3.12
 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}
 
@@ -89,7 +89,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 =