diff --git a/.env-ubuntu24.yml b/.env-ubuntu24.yml
new file mode 100644
index 0000000..3f25928
--- /dev/null
+++ b/.env-ubuntu24.yml
@@ -0,0 +1,4 @@
+# codename jammy
+CI_HOSTNAME: ci-ubuntu24
+CI_IMAGE: docker.io/ubuntu:24.04
+CI_DOCKERFILE: apt.j2
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 99ca8e0..4a23c9c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -154,6 +154,8 @@ jobs:
         include:
 
           - os: debian12
+          - os: ubuntu22
+          - os: ubuntu24
           - os: centos7
           - os: c9s
           - os: fedora39
@@ -203,10 +205,16 @@ jobs:
 
         include:
 
-          # The ansible provided by ubuntu is a joke
+          - os: debian12
+            ansible_version: '2.14'
+
+          # The ansible provided by ubuntu 22 is a joke
           #
           #- os: ubuntu22
           #  ansible_version: '2.12'
+          
+          - os: ubuntu24
+            ansible_version: '2.14'
 
           - os: alma9
             ansible_version: '2.14'
@@ -214,9 +222,6 @@ jobs:
           - os: rocky9
             ansible_version: '2.14'
 
-          - os: debian12
-            ansible_version: '2.14'
-
           - os: fedora39
             ansible_version: '2.16'
 
@@ -290,6 +295,7 @@ jobs:
           #- arch
           - debian12
           - ubuntu22
+          - ubuntu24
           - fedora38
           - fedora39
           - fedora40
@@ -400,6 +406,12 @@ jobs:
             python_version: '3.9'
           - os: ubuntu22
             python_version: '3.12'
+          
+          # ubuntu24 has 3.11, 3.12
+          - os: ubuntu22
+            python_version: '3.9'
+          - os: ubuntu22
+            python_version: '3.10'
 
     env:
       ANSIBLE_VERSION: ${{ matrix.ansible_version }}
diff --git a/roles/controlnode/vars/Ubuntu-24.yml b/roles/controlnode/vars/Ubuntu-24.yml
new file mode 100644
index 0000000..701ebcd
--- /dev/null
+++ b/roles/controlnode/vars/Ubuntu-24.yml
@@ -0,0 +1,16 @@
+# Copyright (c) Markus Falb <markus.falb@mafalb.at>
+# GNU General Public License v3.0+
+# see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt
+---
+mafalb_ansible_default_version: "2.14"
+mafalb_ansible_deps:
+  "2.14": []
+mafalb_ansible_test_deps:
+  "2.14": []
+mafalb_ansible_package:
+  "2.14":
+    - ansible-core
+mafalb_collections_package:
+  "2.14": []
+mafalb_ansible_test_package:
+  "2.14": []
diff --git a/roles/python/vars/Ubuntu-24.yml b/roles/python/vars/Ubuntu-24.yml
new file mode 100644
index 0000000..b84495c
--- /dev/null
+++ b/roles/python/vars/Ubuntu-24.yml
@@ -0,0 +1,17 @@
+# Copyright (c) Markus Falb <markus.falb@mafalb.at>
+# GNU General Public License v3.0+
+# see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt
+---
+python_default_version: "3.11"
+python_package:
+  _default: python3
+  "3.11": python3
+  "3.12": python3.12
+python_extra_packages:
+  _default: &default_packages
+    - python3-venv
+    - python3-setuptools
+  "3.11": *default_packages
+  "3.12":
+    - python3.12-venv
+...