diff --git a/charms/aodh-k8s/charmcraft.yaml b/charms/aodh-k8s/charmcraft.yaml
index 9919a131..5c988276 100644
--- a/charms/aodh-k8s/charmcraft.yaml
+++ b/charms/aodh-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-aodh-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/barbican-k8s/charmcraft.yaml b/charms/barbican-k8s/charmcraft.yaml
index f800c024..b73d4e77 100644
--- a/charms/barbican-k8s/charmcraft.yaml
+++ b/charms/barbican-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-barbican-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/ceilometer-k8s/charmcraft.yaml b/charms/ceilometer-k8s/charmcraft.yaml
index 0ee6de06..48e013bc 100644
--- a/charms/ceilometer-k8s/charmcraft.yaml
+++ b/charms/ceilometer-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-ceilometer-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/cinder-ceph-k8s/charmcraft.yaml b/charms/cinder-ceph-k8s/charmcraft.yaml
index 19afd61c..d1c3f44b 100644
--- a/charms/cinder-ceph-k8s/charmcraft.yaml
+++ b/charms/cinder-ceph-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-cinder-ceph-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/cinder-k8s/charmcraft.yaml b/charms/cinder-k8s/charmcraft.yaml
index 2a6f4173..f8e0f0ee 100644
--- a/charms/cinder-k8s/charmcraft.yaml
+++ b/charms/cinder-k8s/charmcraft.yaml
@@ -13,7 +13,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-cinder-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/designate-bind-k8s/charmcraft.yaml b/charms/designate-bind-k8s/charmcraft.yaml
index cc11aecc..166d7c03 100644
--- a/charms/designate-bind-k8s/charmcraft.yaml
+++ b/charms/designate-bind-k8s/charmcraft.yaml
@@ -16,7 +16,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-designate-bind-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/designate-k8s/charmcraft.yaml b/charms/designate-k8s/charmcraft.yaml
index b68f883f..47aba96c 100644
--- a/charms/designate-k8s/charmcraft.yaml
+++ b/charms/designate-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-designate-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/glance-k8s/charmcraft.yaml b/charms/glance-k8s/charmcraft.yaml
index e8ff9a30..ad8a9698 100644
--- a/charms/glance-k8s/charmcraft.yaml
+++ b/charms/glance-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-glance-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/gnocchi-k8s/charmcraft.yaml b/charms/gnocchi-k8s/charmcraft.yaml
index 4e255701..06cd3863 100644
--- a/charms/gnocchi-k8s/charmcraft.yaml
+++ b/charms/gnocchi-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-gnocchi-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/heat-k8s/charmcraft.yaml b/charms/heat-k8s/charmcraft.yaml
index c09708ae..474bb0f9 100644
--- a/charms/heat-k8s/charmcraft.yaml
+++ b/charms/heat-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-heat-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/horizon-k8s/charmcraft.yaml b/charms/horizon-k8s/charmcraft.yaml
index d60d0979..7af3dc0b 100644
--- a/charms/horizon-k8s/charmcraft.yaml
+++ b/charms/horizon-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-horizon-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/keystone-k8s/charmcraft.yaml b/charms/keystone-k8s/charmcraft.yaml
index edf1c0b2..5a888cfb 100644
--- a/charms/keystone-k8s/charmcraft.yaml
+++ b/charms/keystone-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-keystone-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/keystone-ldap-k8s/charmcraft.yaml b/charms/keystone-ldap-k8s/charmcraft.yaml
index 7ce3751b..9038f505 100644
--- a/charms/keystone-ldap-k8s/charmcraft.yaml
+++ b/charms/keystone-ldap-k8s/charmcraft.yaml
@@ -8,7 +8,7 @@ description: |
   deployment. This charm supports use of LDAP or Active Directory domain backends,
   with configuration details provided by charm configuration options.
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/magnum-k8s/charmcraft.yaml b/charms/magnum-k8s/charmcraft.yaml
index 2f7bb059..a16210ab 100644
--- a/charms/magnum-k8s/charmcraft.yaml
+++ b/charms/magnum-k8s/charmcraft.yaml
@@ -8,7 +8,7 @@ assumes:
   - k8s-api
   - juju >= 3.1
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/masakari-k8s/charmcraft.yaml b/charms/masakari-k8s/charmcraft.yaml
index c6507941..655b0094 100644
--- a/charms/masakari-k8s/charmcraft.yaml
+++ b/charms/masakari-k8s/charmcraft.yaml
@@ -15,7 +15,7 @@ links:
   source: https://opendev.org/openstack/sunbeam-charms
   issues: https://bugs.launchpad.net/sunbeam-charms
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/neutron-k8s/charmcraft.yaml b/charms/neutron-k8s/charmcraft.yaml
index 090d13f1..30d7ff8c 100644
--- a/charms/neutron-k8s/charmcraft.yaml
+++ b/charms/neutron-k8s/charmcraft.yaml
@@ -21,7 +21,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-neutron-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/nova-k8s/charmcraft.yaml b/charms/nova-k8s/charmcraft.yaml
index fbf18f28..6af240ae 100644
--- a/charms/nova-k8s/charmcraft.yaml
+++ b/charms/nova-k8s/charmcraft.yaml
@@ -22,7 +22,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-nova-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/octavia-k8s/charmcraft.yaml b/charms/octavia-k8s/charmcraft.yaml
index 2d490ea0..2df0427d 100644
--- a/charms/octavia-k8s/charmcraft.yaml
+++ b/charms/octavia-k8s/charmcraft.yaml
@@ -13,7 +13,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-octavia-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/openstack-exporter-k8s/charmcraft.yaml b/charms/openstack-exporter-k8s/charmcraft.yaml
index e05efef2..d68baa17 100644
--- a/charms/openstack-exporter-k8s/charmcraft.yaml
+++ b/charms/openstack-exporter-k8s/charmcraft.yaml
@@ -12,7 +12,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-openstack-exporter-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/openstack-images-sync-k8s/charmcraft.yaml b/charms/openstack-images-sync-k8s/charmcraft.yaml
index 2dde2e58..b666e25d 100644
--- a/charms/openstack-images-sync-k8s/charmcraft.yaml
+++ b/charms/openstack-images-sync-k8s/charmcraft.yaml
@@ -5,7 +5,7 @@ summary: Keep OpenStack images in sync with the latest versions
 description: |
   Openstack Images Sync operator allows synchronization from a SimpleStreams source to an OpenStack cloud.
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/ovn-central-k8s/charmcraft.yaml b/charms/ovn-central-k8s/charmcraft.yaml
index fb5e8505..f6ca9f4b 100644
--- a/charms/ovn-central-k8s/charmcraft.yaml
+++ b/charms/ovn-central-k8s/charmcraft.yaml
@@ -30,7 +30,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-ovn-central-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/ovn-relay-k8s/charmcraft.yaml b/charms/ovn-relay-k8s/charmcraft.yaml
index 4715036a..489c13d1 100644
--- a/charms/ovn-relay-k8s/charmcraft.yaml
+++ b/charms/ovn-relay-k8s/charmcraft.yaml
@@ -16,7 +16,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-ovn-relay-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/placement-k8s/charmcraft.yaml b/charms/placement-k8s/charmcraft.yaml
index 20c0cb5e..24ed73a1 100644
--- a/charms/placement-k8s/charmcraft.yaml
+++ b/charms/placement-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues:
     - https://bugs.launchpad.net/charm-placement-k8s
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/tempest-k8s/charmcraft.yaml b/charms/tempest-k8s/charmcraft.yaml
index 275379b5..5afc6766 100644
--- a/charms/tempest-k8s/charmcraft.yaml
+++ b/charms/tempest-k8s/charmcraft.yaml
@@ -14,7 +14,7 @@ links:
   issues: https://bugs.launchpad.net/sunbeam-charms
   documentation: https://discourse.charmhub.io/t/tempest-k8s-docs-index/13258
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/charms/watcher-k8s/charmcraft.yaml b/charms/watcher-k8s/charmcraft.yaml
index a57e9ecf..29b9c2ff 100644
--- a/charms/watcher-k8s/charmcraft.yaml
+++ b/charms/watcher-k8s/charmcraft.yaml
@@ -16,7 +16,7 @@ links:
   source: https://opendev.org/openstack/sunbeam-charms
   issues: https://bugs.launchpad.net/sunbeam-charms
 
-base: ubuntu@22.04
+base: ubuntu@24.04
 platforms:
   amd64:
 
diff --git a/run_tox.sh b/run_tox.sh
index 5d5a28fe..073b963d 100755
--- a/run_tox.sh
+++ b/run_tox.sh
@@ -67,7 +67,7 @@ then
     ops_sunbeam_src_path="ops-sunbeam/ops_sunbeam"
 
     PYTHONPATH=$(python3 ./repository.py pythonpath) mypy ${ops_sunbeam_src_path}
-elif [[ $1 =~ ^(py3|py310|py311)$ ]];
+elif [[ $1 =~ ^(py3|py310|py312)$ ]];
 then
 
     # Run py3 on ops-sunbeam
@@ -159,6 +159,6 @@ then
     cp charms/$charm/${charm}.charm . || exit 1
     python3 repository.py -v clean $charm || exit 1
 else
-    echo "tox argument should be one of pep8, py3, py310, py311, cover";
+    echo "tox argument should be one of pep8, py3, py310, py312, cover";
     exit 1
 fi
diff --git a/tests/caas/smoke.yaml.j2 b/tests/caas/smoke.yaml.j2
index b3404324..903146b1 100644
--- a/tests/caas/smoke.yaml.j2
+++ b/tests/caas/smoke.yaml.j2
@@ -47,7 +47,7 @@ applications:
     charm: ch:ovn-central-k8s
     channel: 24.03/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -61,7 +61,7 @@ applications:
     charm: ch:keystone-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -76,7 +76,7 @@ applications:
     charm: ch:glance-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -90,7 +90,7 @@ applications:
     charm: ch:heat-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -103,7 +103,7 @@ applications:
     charm: ch:octavia-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -117,7 +117,7 @@ applications:
     charm: ch:barbican-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: false
     resources:
@@ -130,7 +130,7 @@ applications:
     charm: ch:magnum-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: false
     resources:
diff --git a/tests/ceph/smoke.yaml.j2 b/tests/ceph/smoke.yaml.j2
index e364c4f2..af283aef 100644
--- a/tests/ceph/smoke.yaml.j2
+++ b/tests/ceph/smoke.yaml.j2
@@ -33,7 +33,7 @@ applications:
     charm: ch:keystone-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -48,7 +48,7 @@ applications:
     charm: ch:cinder-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -61,7 +61,7 @@ applications:
     charm: ch:cinder-ceph-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -73,7 +73,7 @@ applications:
     charm: ch:gnocchi-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -86,7 +86,7 @@ applications:
     charm: ch:ceilometer-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -99,7 +99,7 @@ applications:
     charm: ch:aodh-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -115,7 +115,7 @@ applications:
     charm: ch:watcher-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
diff --git a/tests/core/smoke.yaml.j2 b/tests/core/smoke.yaml.j2
index d00ed0f8..96c919dd 100644
--- a/tests/core/smoke.yaml.j2
+++ b/tests/core/smoke.yaml.j2
@@ -40,7 +40,7 @@ applications:
     charm: ch:ovn-central-k8s
     channel: 24.03/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -54,7 +54,7 @@ applications:
     charm: ch:ovn-relay-k8s
     channel: 24.03/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -66,7 +66,7 @@ applications:
     charm: ch:keystone-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -81,7 +81,7 @@ applications:
     charm: ch:glance-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -95,7 +95,7 @@ applications:
     charm: ch:nova-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -110,7 +110,7 @@ applications:
     charm: ch:placement-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -122,7 +122,7 @@ applications:
     charm: ch:neutron-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
@@ -136,7 +136,7 @@ applications:
     charm: ch:openstack-images-sync-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
diff --git a/tests/misc/smoke.yaml.j2 b/tests/misc/smoke.yaml.j2
index b1860d71..2af907ac 100644
--- a/tests/misc/smoke.yaml.j2
+++ b/tests/misc/smoke.yaml.j2
@@ -38,7 +38,7 @@ applications:
     charm: ch:keystone-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -53,7 +53,7 @@ applications:
     charm: ch:designate-bind-k8s
     channel: 9/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: false
     resources:
@@ -65,7 +65,7 @@ applications:
     charm: ch:designate-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: false
     resources:
@@ -77,7 +77,7 @@ applications:
     charm: ch:keystone-ldap-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
   openstack-exporter:
     {% if openstack_exporter_k8s is defined and openstack_exporter_k8s is sameas true -%}
@@ -86,7 +86,7 @@ applications:
     charm: ch:openstack-exporter-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     resources:
       openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.6.0-7533071
@@ -97,7 +97,7 @@ applications:
     charm: ch:horizon-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -109,7 +109,7 @@ applications:
     charm: ch:masakari-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -167,4 +167,4 @@ relations:
   - masakari:ingress-public
 
 - - masakari:consul-management
-  - consul:consul-cluster
\ No newline at end of file
+  - consul:consul-cluster
diff --git a/tests/tempest/smoke.yaml.j2 b/tests/tempest/smoke.yaml.j2
index 882dc570..312d9d64 100644
--- a/tests/tempest/smoke.yaml.j2
+++ b/tests/tempest/smoke.yaml.j2
@@ -40,7 +40,7 @@ applications:
     charm: ch:ovn-central-k8s
     channel: 24.03/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -54,7 +54,7 @@ applications:
     charm: ch:ovn-relay-k8s
     channel: 24.03/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -66,7 +66,7 @@ applications:
     charm: ch:keystone-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -81,7 +81,7 @@ applications:
     charm: ch:glance-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     storage:
@@ -95,7 +95,7 @@ applications:
     charm: ch:nova-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -110,7 +110,7 @@ applications:
     charm: ch:placement-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
@@ -122,7 +122,7 @@ applications:
     charm: ch:neutron-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     options:
@@ -136,7 +136,7 @@ applications:
     charm: ch:tempest-k8s
     channel: 2024.1/edge
     {% endif -%}
-    base: ubuntu@22.04
+    base: ubuntu@24.04
     scale: 1
     trust: true
     resources:
diff --git a/tox.ini b/tox.ini
index efd86fab..b3f3d8da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,10 +60,10 @@ deps = {[testenv:py3]deps}
 commands =
   {toxinidir}/run_tox.sh py310 {posargs}
 
-[testenv:py311]
+[testenv:py312]
 deps = {[testenv:py3]deps}
 commands =
-  {toxinidir}/run_tox.sh py311 {posargs}
+  {toxinidir}/run_tox.sh py312 {posargs}
 
 [testenv:cover]
 deps = {[testenv:py3]deps}
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 55ba078c..08d2a7b3 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -2,7 +2,7 @@
     name: openstack-python3-sunbeam-jobs
     # NOTE(hemanth): This template is used in openstack sunbeam charms since
     # stable/2023.1. The stable/2023.1 and stable/2023.2 charm branches
-    # support py310 unit tests and main support py310, py311 tests.
+    # support py310 unit tests and main support py310, py312 tests.
     description: |
       Runs unit tests for an OpenStack Sunbeam project under the CPython
       version 3 releases designated for testing the latest release.
@@ -15,7 +15,7 @@
               - stable/2023.1
               - stable/2023.2
               - main
-        - openstack-tox-py311:
+        - openstack-tox-py312:
             branches:
               - main
     gate:
@@ -27,7 +27,7 @@
               - stable/2023.1
               - stable/2023.2
               - main
-        - openstack-tox-py311:
+        - openstack-tox-py312:
             branches:
               - main
 
@@ -215,4 +215,4 @@
             - publish-charm-tempest-k8s:
                 nodeset: ubuntu-jammy
             - publish-charm-watcher-k8s:
-                nodeset: ubuntu-jammy
\ No newline at end of file
+                nodeset: ubuntu-jammy