diff --git a/charmcraft.yaml b/charmcraft.yaml
index 9a9ac47..652ab74 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -29,9 +29,3 @@ bases:
       - name: ubuntu
         channel: "22.04"
         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 3cc46bb..3a5aa1b 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,8 +2,8 @@ name: cinder-nimblestorage
 summary: NimbleStorage integration for OpenStack Block Storage
 maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
- Cinder is the block storage service for the Openstack project.
- This charm provides a NimbleStorage backend for Cinder.
+  Cinder is the block storage service for the Openstack project.
+  This charm provides a NimbleStorage backend for Cinder.
 tags:
   - openstack
   - storage
@@ -11,8 +11,6 @@ tags:
   - misc
 series:
   - jammy
-  - lunar
-  - mantic
 subordinate: true
 provides:
   storage-backend:
diff --git a/osci.yaml b/osci.yaml
index 3898cf7..bdb4193 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,4 +7,4 @@
       needs_charm_build: true
       charm_build_name: cinder-nimblestorage
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable
diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml
index d1c76b6..2cfa58a 100644
--- a/tests/bundles/jammy-antelope.yaml
+++ b/tests/bundles/jammy-antelope.yaml
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'
diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml
index 27e560f..72d38b5 100644
--- a/tests/bundles/jammy-bobcat.yaml
+++ b/tests/bundles/jammy-bobcat.yaml
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'
diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/jammy-caracal.yaml
similarity index 94%
rename from tests/bundles/mantic-bobcat.yaml
rename to tests/bundles/jammy-caracal.yaml
index 2b7a8ea..cf8bf6e 100644
--- a/tests/bundles/mantic-bobcat.yaml
+++ b/tests/bundles/jammy-caracal.yaml
@@ -1,6 +1,6 @@
-series: mantic
+series: jammy
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 comment:
   - machines section to decide order of deployment. database sooner = faster
 
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'
diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/noble-caracal.yaml
similarity index 96%
rename from tests/bundles/lunar-antelope.yaml
rename to tests/bundles/noble-caracal.yaml
index 276be78..e5d2078 100644
--- a/tests/bundles/lunar-antelope.yaml
+++ b/tests/bundles/noble-caracal.yaml
@@ -1,4 +1,4 @@
-series: lunar
+series: noble
 variables:
   openstack-origin: &openstack-origin distro
 comment:
@@ -37,7 +37,7 @@ applications:
       - '3'
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: 2024.1/edge
     options:
       openstack-origin: *openstack-origin
     num_units: 1
@@ -48,7 +48,7 @@ applications:
     channel: latest/edge
   cinder:
     charm: ch:cinder
-    channel: latest/edge
+    channel: 2024.1/edge
     num_units: 1
     storage:
       block-devices: '40G'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8300b4a..86cdc69 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -5,13 +5,12 @@ configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
   - jammy-antelope
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
-  - mantic-bobcat
+  - jammy-caracal
+dev_bundles:
+  - noble-caracal
 smoke_bundles:
-  - jammy-antelope
+  - jammy-caracal
 tests_options:
   force_deploy:
-    - lunar-antelope
-    - mantic-bobcat
+    - noble-caracal