diff --git a/charmcraft.yaml b/charmcraft.yaml
index 75c5e37..0b55422 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -32,9 +32,9 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
index 2531162..0bb9485 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -16,8 +16,8 @@ subordinate: true
 series:
 - focal
 - jammy
-- kinetic
 - lunar
+- mantic
 requires:
   dashboard:
     interface: ceph-dashboard
diff --git a/osci.yaml b/osci.yaml
index 9fdcb42..df2d7b9 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -3,7 +3,6 @@
       - charm-unit-jobs-py38
       - charm-unit-jobs-py310
       - charm-yoga-functional-jobs
-      - charm-zed-functional-jobs
       - charm-functional-jobs
     vars:
       needs_charm_build: true
diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml
index dfb6f2e..b8def79 100644
--- a/tests/bundles/jammy-antelope.yaml
+++ b/tests/bundles/jammy-antelope.yaml
@@ -10,14 +10,12 @@ applications:
       osd-devices: 'cinder,10G,2'
     options:
       osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
     channel: quincy/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
-      source: *openstack-origin
     channel: quincy/edge
   vault:
     num_units: 1
@@ -27,10 +25,10 @@ applications:
     charm: ch:mysql-innodb-cluster
     constraints: mem=3072M
     num_units: 3
-    channel: 8.0/edge
+    channel: latest/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0/edge
+    channel: latest/edge
   ceph-dashboard:
     charm: ../../ceph-dashboard.charm
     options:
diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/jammy-bobcat.yaml
similarity index 91%
rename from tests/bundles/jammy-zed.yaml
rename to tests/bundles/jammy-bobcat.yaml
index 90ba720..42462d1 100644
--- a/tests/bundles/jammy-zed.yaml
+++ b/tests/bundles/jammy-bobcat.yaml
@@ -1,7 +1,7 @@
 local_overlay_enabled: False
 series: jammy
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 applications:
   ceph-osd:
     charm: ch:ceph-osd
@@ -10,15 +10,13 @@ applications:
       osd-devices: 'cinder,10G,2'
     options:
       osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    channel: quincy/edge
+    channel: latest/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
-      source: *openstack-origin
-    channel: quincy/edge
+    channel: latest/edge
   vault:
     num_units: 1
     charm: ch:vault
@@ -30,7 +28,7 @@ applications:
     channel: latest/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0/edge
+    channel: latest/edge
   ceph-dashboard:
     charm: ../../ceph-dashboard.charm
     options:
@@ -58,17 +56,17 @@ applications:
   ceph-radosgw:
     charm: ch:ceph-radosgw
     num_units: 3
-    channel: quincy/edge
+    channel: latest/edge
   ceph-fs:
     charm: ch:ceph-fs
     num_units: 1
-    channel: quincy/edge
+    channel: latest/edge
   ceph-iscsi:
     charm: ch:ceph-iscsi
     num_units: 2
     options:
       gateway-metadata-pool: iscsi-foo-metadata
-    channel: quincy/edge
+    channel: latest/edge
 relations:
   - - 'ceph-osd:mon'
     - 'ceph-mon:osd'
diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/lunar-antelope.yaml
index e2a1ba2..fcfa66d 100644
--- a/tests/bundles/lunar-antelope.yaml
+++ b/tests/bundles/lunar-antelope.yaml
@@ -10,7 +10,6 @@ applications:
     storage:
       osd-devices: 'cinder,10G,2'
     options:
-      source: *source
       osd-devices: '/dev/test-non-existent'
     channel: quincy/edge
   ceph-mon:
@@ -18,7 +17,6 @@ applications:
     series: lunar
     num_units: 3
     options:
-      source: *source
       monitor-count: '3'
     channel: quincy/edge
   vault:
@@ -29,12 +27,10 @@ applications:
     charm: ch:mysql-innodb-cluster
     constraints: mem=3072M
     num_units: 3
-    options:
-      source: *source
-    channel: 8.0/edge
+    channel: latest/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0/edge
+    channel: latest/edge
   ceph-dashboard:
     charm: ../../ceph-dashboard.charm
     options:
@@ -61,22 +57,17 @@ applications:
     charm: ch:ceph-radosgw
     series: lunar
     num_units: 3
-    options:
-      source: *source
     channel: quincy/edge
   ceph-fs:
     charm: ch:ceph-fs
     series: lunar
     num_units: 1
-    options:
-      source: *source
     channel: quincy/edge
   ceph-iscsi:
     charm: ch:ceph-iscsi
     series: lunar
     num_units: 2
     options:
-      source: *source
       gateway-metadata-pool: iscsi-foo-metadata
     channel: quincy/edge
 relations:
diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/mantic-bobcat.yaml
similarity index 90%
rename from tests/bundles/kinetic-zed.yaml
rename to tests/bundles/mantic-bobcat.yaml
index a7df8a7..2f4d4f9 100644
--- a/tests/bundles/kinetic-zed.yaml
+++ b/tests/bundles/mantic-bobcat.yaml
@@ -1,24 +1,22 @@
 local_overlay_enabled: False
-series: kinetic
+series: mantic
 variables:
   source: &source distro
 applications:
   ceph-osd:
     charm: ch:ceph-osd
-    series: kinetic
+    series: mantic
     num_units: 6
     storage:
       osd-devices: 'cinder,10G,2'
     options:
-      source: *source
       osd-devices: '/dev/test-non-existent'
     channel: latest/edge
   ceph-mon:
     charm: ch:ceph-mon
-    series: kinetic
+    series: mantic
     num_units: 3
     options:
-      source: *source
       monitor-count: '3'
     channel: latest/edge
   vault:
@@ -29,8 +27,6 @@ applications:
     charm: ch:mysql-innodb-cluster
     constraints: mem=3072M
     num_units: 3
-    options:
-      source: *source
     channel: latest/edge
   vault-mysql-router:
     charm: ch:mysql-router
@@ -59,24 +55,19 @@ applications:
     series: focal
   ceph-radosgw:
     charm: ch:ceph-radosgw
-    series: kinetic
+    series: mantic
     num_units: 3
-    options:
-      source: *source
     channel: latest/edge
   ceph-fs:
     charm: ch:ceph-fs
-    series: kinetic
+    series: mantic
     num_units: 1
-    options:
-      source: *source
     channel: latest/edge
   ceph-iscsi:
     charm: ch:ceph-iscsi
-    series: kinetic
+    series: mantic
     num_units: 2
     options:
-      source: *source
       gateway-metadata-pool: iscsi-foo-metadata
     channel: latest/edge
 relations:
diff --git a/tests/tests.yaml b/tests/tests.yaml
index f19bf66..11721de 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,6 +2,8 @@ charm_name: ceph-dasboard
 gate_bundles:
   - focal
   - jammy
+  - jammy-bobcat
+  - mantic-bobcat
 smoke_bundles:
   - focal
 configure:
@@ -27,3 +29,6 @@ target_deploy_status:
   telegraf:
     workload-status: active
     workload-status-message-prefix: Monitoring
+tests_options:
+  force_deploy:
+    - mantic-bobcat