diff --git a/charmcraft.yaml b/charmcraft.yaml
index 10cfae8..ef78908 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -20,7 +20,6 @@ parts:
       - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
       - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
       - MAKEFLAGS: -j$(nproc)
-
 bases:
   - build-on:
       - name: ubuntu
@@ -30,51 +29,91 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
+        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]
+  - build-on:
+      - name: ubuntu
+        channel: "23.04"
         architectures: [amd64]
+    run-on:
       - name: ubuntu
         channel: "23.04"
         architectures: [amd64]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
+        channel: "23.04"
+        architectures: [s390x]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [arm64]
       - name: ubuntu
         channel: "23.04"
-        architectures: [arm64]
+        architectures: [s390x]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.04"
         architectures: [ppc64el]
     run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-      - name: ubuntu
-        channel: "22.10"
-        architectures: [ppc64el]
       - name: ubuntu
         channel: "23.04"
         architectures: [ppc64el]
   - build-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.04"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [arm64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [amd64]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
         architectures: [s390x]
     run-on:
       - name: ubuntu
-        channel: "22.04"
+        channel: "23.10"
         architectures: [s390x]
+  - build-on:
       - name: ubuntu
-        channel: "22.10"
-        architectures: [s390x]
+        channel: "23.10"
+        architectures: [ppc64el]
+    run-on:
       - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
+        channel: "23.10"
+        architectures: [ppc64el]
+  - build-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]
+    run-on:
+      - name: ubuntu
+        channel: "23.10"
+        architectures: [arm64]
diff --git a/osci.yaml b/osci.yaml
index eb1b05f..69fe6b4 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: ovn-dedicated-chassis
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/edge
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 73be22d..acdc2bc 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -8,8 +8,8 @@ tags:
 - networking
 series:
 - jammy
-- kinetic
 - lunar
+- mantic
 subordinate: false
 extra-bindings:
   data:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
index b3968f9..29c0b27 100644
--- a/src/tests/bundles/jammy-antelope.yaml
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -22,7 +22,7 @@ applications:
     channel: latest/edge
 
   ovn-dedicated-chassis:
-    charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64.charm
     num_units: 2
     options:
       source: *openstack-origin
diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml
similarity index 80%
rename from src/tests/bundles/jammy-zed.yaml
rename to src/tests/bundles/jammy-bobcat.yaml
index 0d5f8ac..e17719b 100644
--- a/src/tests/bundles/jammy-zed.yaml
+++ b/src/tests/bundles/jammy-bobcat.yaml
@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-zed
+  openstack-origin: &openstack-origin cloud:jammy-bobcat
 
 local_overlay_enabled: False
 
@@ -22,11 +22,12 @@ applications:
     channel: latest/edge
 
   ovn-dedicated-chassis:
-    charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64.charm
     num_units: 2
     options:
       source: *openstack-origin
 
+
 relations:
 
   - - 'ovn-central:certificates'
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml
index fe65e9f..c91cff8 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -22,7 +22,7 @@ applications:
     channel: latest/edge
 
   ovn-dedicated-chassis:
-    charm: ../../../ovn-dedicated-chassis_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    charm: ../../../ovn-dedicated-chassis_ubuntu-23.04-amd64.charm
     num_units: 2
     options:
       source: *openstack-origin
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml
new file mode 100644
index 0000000..fe4b754
--- /dev/null
+++ b/src/tests/bundles/mantic-bobcat.yaml
@@ -0,0 +1,38 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+local_overlay_enabled: False
+
+series: mantic
+
+applications:
+
+  vault:
+    charm: ch:vault
+    num_units: 1
+    # The vault raft support is currently only available for jammy
+    series: jammy
+    channel: latest/edge
+  
+  ovn-central:
+    charm: ch:ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+    channel: latest/edge
+
+  ovn-dedicated-chassis:
+    charm: ../../../ovn-dedicated-chassis_ubuntu-23.10-amd64.charm
+    num_units: 2
+    options:
+      source: *openstack-origin
+
+
+relations:
+
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:ovsdb'
+    - 'ovn-central:ovsdb'
+  - - 'ovn-dedicated-chassis:certificates'
+    - 'vault:certificates'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 48cf650..8d0e532 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,15 +1,15 @@
 charm_name: ovn-dedicated-chassis
 
 gate_bundles:
-- jammy-zed
+- jammy-antelope
 
 smoke_bundles:
-- jammy-zed
+- jammy-antelope
 
 dev_bundles:
-- jammy-zed
-- jammy-antelope
+- jammy-bobcat
 - lunar-antelope
+- mantic-bobcat
 
 target_deploy_status:
   ovn-central:
@@ -32,3 +32,4 @@ tests:
 tests_options:
   force_deploy:
     - lunar-antelope
+    - mantic-bobcat