diff --git a/charmcraft.yaml b/charmcraft.yaml
index 2df13f1..c31dea1 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -22,9 +22,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/src/metadata.yaml b/src/metadata.yaml
index e6f94d4..f2c7743 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -4,12 +4,10 @@ maintainer: Gabriel-Adrian Samfira <gsamfira@cloudbasesolutions.com>
 description: |
   Ironic baremetal mechanism driver and ironic neutron agent support
 tags:
-- misc
-- networking
+  - misc
+  - networking
 series:
-- jammy
-- lunar
-- mantic
+  - jammy
 subordinate: true
 provides:
   neutron-plugin-api-subordinate:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
index 74a8c82..1913cf8 100644
--- a/src/tests/bundles/jammy-antelope.yaml
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -177,7 +177,7 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: latest/edge
+    channel: 2024.1/edge
   ceph-radosgw:
     charm: ch:ceph-radosgw
     num_units: 1
@@ -185,7 +185,7 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -193,7 +193,7 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: latest/edge
+    channel: reef/edge
   ceph-osd:
     charm: ch:ceph-osd
     num_units: 3
@@ -202,7 +202,7 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: latest/edge
+    channel: reef/edge
   glance:
     charm: ch:glance
     num_units: 1
@@ -210,7 +210,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
@@ -218,7 +218,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-api:
     charm: ch:neutron-api
     num_units: 1
@@ -229,7 +229,7 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-gateway:
     charm: ch:neutron-gateway
     num_units: 1
@@ -239,7 +239,7 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
@@ -248,7 +248,7 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-ironic:
     charm: ch:nova-compute
     num_units: 1
@@ -258,7 +258,7 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
@@ -266,7 +266,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
@@ -282,7 +282,7 @@ services:
     constraints: mem=2G
     options:
       openstack-origin: *source
-    channel: latest/edge
+    channel: 2024.1/edge
   ironic-conductor:
     charm: ch:ironic-conductor
     num_units: 1
@@ -293,13 +293,13 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic.charm
     num_units: 0
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml
index 4b2d7a9..0b6f1a2 100644
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ b/src/tests/bundles/jammy-bobcat.yaml
@@ -177,7 +177,7 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: latest/edge
+    channel: 2024.1/edge
   ceph-radosgw:
     charm: ch:ceph-radosgw
     num_units: 1
@@ -185,7 +185,7 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -193,7 +193,7 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: latest/edge
+    channel: reef/edge
   ceph-osd:
     charm: ch:ceph-osd
     num_units: 3
@@ -202,7 +202,7 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: latest/edge
+    channel: reef/edge
   glance:
     charm: ch:glance
     num_units: 1
@@ -210,7 +210,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
@@ -218,7 +218,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-api:
     charm: ch:neutron-api
     num_units: 1
@@ -229,7 +229,7 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-gateway:
     charm: ch:neutron-gateway
     num_units: 1
@@ -239,7 +239,7 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
@@ -248,7 +248,7 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-ironic:
     charm: ch:nova-compute
     num_units: 1
@@ -258,7 +258,7 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
@@ -266,7 +266,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
@@ -282,7 +282,7 @@ services:
     constraints: mem=2G
     options:
       openstack-origin: *source
-    channel: latest/edge
+    channel: 2024.1/edge
   ironic-conductor:
     charm: ch:ironic-conductor
     num_units: 1
@@ -293,13 +293,13 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic.charm
     num_units: 0
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/jammy-caracal.yaml
similarity index 94%
rename from src/tests/bundles/mantic-bobcat.yaml
rename to src/tests/bundles/jammy-caracal.yaml
index 4d6f118..cbea4a5 100644
--- a/src/tests/bundles/mantic-bobcat.yaml
+++ b/src/tests/bundles/jammy-caracal.yaml
@@ -1,6 +1,6 @@
 options:
-  source: &source distro
-series: mantic
+  source: &source cloud:jammy-caracal
+series: jammy
 local_overlay_enabled: false
 relations:
 - - nova-ironic
@@ -177,7 +177,7 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: latest/edge
+    channel: 2024.1/edge
   ceph-radosgw:
     charm: ch:ceph-radosgw
     num_units: 1
@@ -185,7 +185,7 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -193,7 +193,7 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: latest/edge
+    channel: reef/edge
   ceph-osd:
     charm: ch:ceph-osd
     num_units: 3
@@ -202,7 +202,7 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: latest/edge
+    channel: reef/edge
   glance:
     charm: ch:glance
     num_units: 1
@@ -210,7 +210,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
@@ -218,7 +218,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-api:
     charm: ch:neutron-api
     num_units: 1
@@ -229,7 +229,7 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-gateway:
     charm: ch:neutron-gateway
     num_units: 1
@@ -239,7 +239,7 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
@@ -248,7 +248,7 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-ironic:
     charm: ch:nova-compute
     num_units: 1
@@ -258,7 +258,7 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
@@ -266,7 +266,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
@@ -282,7 +282,7 @@ services:
     constraints: mem=2G
     options:
       openstack-origin: *source
-    channel: latest/edge
+    channel: 2024.1/edge
   ironic-conductor:
     charm: ch:ironic-conductor
     num_units: 1
@@ -293,13 +293,13 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic.charm
     num_units: 0
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 e5560e5..360cc92 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/noble-caracal.yaml
@@ -1,6 +1,6 @@
 options:
   source: &source distro
-series: lunar
+series: noble
 local_overlay_enabled: false
 relations:
 - - nova-ironic
@@ -177,7 +177,7 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: latest/edge
+    channel: 2024.1/edge
   ceph-radosgw:
     charm: ch:ceph-radosgw
     num_units: 1
@@ -185,7 +185,7 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: latest/edge
+    channel: reef/edge
   ceph-mon:
     charm: ch:ceph-mon
     num_units: 3
@@ -193,7 +193,7 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: latest/edge
+    channel: reef/edge
   ceph-osd:
     charm: ch:ceph-osd
     num_units: 3
@@ -202,7 +202,7 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: latest/edge
+    channel: reef/edge
   glance:
     charm: ch:glance
     num_units: 1
@@ -210,7 +210,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   keystone:
     charm: ch:keystone
     num_units: 1
@@ -218,7 +218,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-api:
     charm: ch:neutron-api
     num_units: 1
@@ -229,7 +229,7 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-gateway:
     charm: ch:neutron-gateway
     num_units: 1
@@ -239,7 +239,7 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
@@ -248,7 +248,7 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   nova-ironic:
     charm: ch:nova-compute
     num_units: 1
@@ -258,7 +258,7 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: latest/edge
+    channel: 2024.1/edge
   placement:
     charm: ch:placement
     num_units: 1
@@ -266,7 +266,7 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: latest/edge
+    channel: 2024.1/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
@@ -282,7 +282,7 @@ services:
     constraints: mem=2G
     options:
       openstack-origin: *source
-    channel: latest/edge
+    channel: 2024.1/edge
   ironic-conductor:
     charm: ch:ironic-conductor
     num_units: 1
@@ -293,13 +293,13 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-openvswitch:
     charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: latest/edge
+    channel: 2024.1/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic.charm
     num_units: 0
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 282079b..6f406d9 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,16 +4,13 @@
 charm_name: ironic-api
 
 gate_bundles:
-- jammy-antelope
-
+  - jammy-antelope
+  - jammy-bobcat
+  - jammy-caracal
 dev_bundles:
-- jammy-bobcat
-- lunar-antelope
-- mantic-bobcat
-
+  - noble-caracal
 smoke_bundles:
-- jammy-antelope
-
+  - jammy-caracal
 target_deploy_status:
   vault:
     workload-status: blocked
@@ -27,21 +24,20 @@ target_deploy_status:
     num-expected-units: 0
 
 configure:
-- zaza.openstack.charm_tests.vault.setup.auto_initialize
-- zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
-- zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
-- zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
-- zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
+  - zaza.openstack.charm_tests.vault.setup.auto_initialize
+  - zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
+  - zaza.openstack.charm_tests.ironic.setup.add_ironic_deployment_image
+  - zaza.openstack.charm_tests.ironic.setup.add_ironic_os_image
+  - zaza.openstack.charm_tests.ironic.setup.create_bm_flavors
 # Ironic will require a flat network to test the flat network type. Once a proper
 # testing environment will be available for Ironic, we will need to add the setup
 # call to create that flat network
 #- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
-- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
+  - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
 
 tests:
-- zaza.openstack.charm_tests.ironic.tests.IronicTest
+  - zaza.openstack.charm_tests.ironic.tests.IronicTest
 
 tests_options:
   force_deploy:
-    - lunar-antelope
-    - mantic-bobcat
+    - noble-caracal
diff --git a/src/tox.ini b/src/tox.ini
index 8ffff0f..2ddcccd 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -25,7 +25,9 @@ passenv =
     CS_*
     OS_*
     TEST_*
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 basepython = python3
diff --git a/tox.ini b/tox.ini
index c11375e..3e44bd9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,12 +61,16 @@ commands =
 
 [testenv:py3]
 basepython = python3
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:py310]
 basepython = python3.10
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
@@ -79,7 +83,9 @@ commands = flake8 {posargs} src unit_tests
 # Technique based heavily upon
 # https://github.com/openstack/nova/blob/master/tox.ini
 basepython = python3
-deps = -r{toxinidir}/requirements.txt
+deps =
+    -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
+    -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 setenv =
     {[testenv]setenv}