diff --git a/charmcraft.yaml b/charmcraft.yaml
index 2df13f1..d95c680 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -4,6 +4,8 @@ parts:
   charm:
     source: src/
     plugin: reactive
+    reactive-charm-build-arguments:
+      - --verbose
     build-packages:
       - libpython3-dev
     build-snaps:
@@ -22,9 +24,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/osci.yaml b/osci.yaml
index 1c10b05..c18807b 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: aodh
       build_type: charmcraft
-      charmcraft_channel: 2.1/stable
+      charmcraft_channel: 2.x/stable
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 1eeb8a0..9a9bd12 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -12,11 +12,9 @@ description: |
   Aodh provides the Alarming service as part of OpenStack telemetry.
 docs: https://discourse.charmhub.io/t/aodh-docs-index/11004
 tags:
-- openstack
+  - openstack
 series:
-- jammy
-- lunar
-- mantic
+  - jammy
 subordinate: false
 requires:
   mongodb:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
index 1036fe4..cc2dd82 100644
--- a/src/tests/bundles/jammy-antelope.yaml
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
@@ -82,7 +82,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -93,7 +93,7 @@ applications:
       - '7'
       - '8'
       - '9'
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -105,7 +105,7 @@ applications:
       - '10'
       - '11'
       - '12'
-    channel: latest/edge
+    channel: reef/edge
 
   gnocchi:
     charm: ch:gnocchi
@@ -114,7 +114,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
index 0498c2e..5e23091 100644
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ b/src/tests/bundles/jammy-bobcat.yaml
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
@@ -82,7 +82,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -93,7 +93,7 @@ applications:
       - '7'
       - '8'
       - '9'
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -105,7 +105,7 @@ applications:
       - '10'
       - '11'
       - '12'
-    channel: latest/edge
+    channel: reef/edge
 
   gnocchi:
     charm: ch:gnocchi
@@ -114,7 +114,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml
similarity index 93%
rename from src/tests/bundles/mantic-bobcat.yaml
rename to src/tests/bundles/jammy-caracal.yaml
index a7881a0..12a303b 100644
--- a/src/tests/bundles/mantic-bobcat.yaml
+++ b/src/tests/bundles/jammy-caracal.yaml
@@ -1,9 +1,9 @@
 local_overlay_enabled: False
 
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-caracal
 
-series: mantic
+series: jammy
 
 machines:
   0:
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
@@ -82,7 +82,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -93,7 +93,7 @@ applications:
       - '7'
       - '8'
       - '9'
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -105,7 +105,7 @@ applications:
       - '10'
       - '11'
       - '12'
-    channel: latest/edge
+    channel: reef/edge
 
   gnocchi:
     charm: ch:gnocchi
@@ -114,12 +114,12 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
     num_units: 1
-    # Note that holding memcached at focal as it's not available at mantic yet.
+    # Note that holding memcached at focal as it's not available at jammy yet.
     series: focal
     to:
       - '14'
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml
similarity index 95%
rename from src/tests/bundles/lunar-antelope.yaml
rename to src/tests/bundles/noble-caracal.yaml
index fff2e22..ecfd284 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -3,7 +3,7 @@ local_overlay_enabled: False
 variables:
   openstack-origin: &openstack-origin distro
 
-series: lunar
+series: noble
 
 machines:
   0:
@@ -73,7 +73,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceilometer:
     charm: ch:ceilometer
@@ -82,7 +82,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   ceph-osd:
     charm: ch:ceph-osd
@@ -93,7 +93,7 @@ applications:
       - '7'
       - '8'
       - '9'
-    channel: latest/edge
+    channel: reef/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -105,7 +105,7 @@ applications:
       - '10'
       - '11'
       - '12'
-    channel: latest/edge
+    channel: reef/edge
 
   gnocchi:
     charm: ch:gnocchi
@@ -114,12 +114,12 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '13'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   memcached:
     charm: ch:memcached
     num_units: 1
-    # Note that holding memcached at focal as it's not available at lunar yet.
+    # Note that holding memcached at focal as it's not available at jammy yet.
     series: focal
     to:
       - '14'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 0760f1f..0f0305f 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -2,12 +2,12 @@ charm_name: aodh
 
 gate_bundles:
   - jammy-antelope
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
-  - mantic-bobcat
+  - jammy-caracal
+dev_bundles:
+  - noble-caracal
 smoke_bundles:
-  - jammy-yoga
+  - jammy-caracal
 tests:
   - zaza.openstack.charm_tests.aodh.tests.AodhTest
 configure:
@@ -26,7 +26,4 @@ tests_options:
   force_deploy:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
-    - jammy-antelope
-    - jammy-bobcat
-    - lunar-antelope
-    - mantic-bobcat
+    - noble-caracal