diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 45bfbf9f0..2a191f150 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   kitchen:
     name: Test Kitchen
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: read
     strategy:
@@ -116,6 +116,7 @@ jobs:
           - wiki
         os:
           - ubuntu-2204
+          - ubuntu-2404
         include:
           - os: ubuntu-2004
             suite: mailman
@@ -132,6 +133,12 @@ jobs:
             os: ubuntu-2204
           - suite: otrs
             os: ubuntu-2204
+          - suite: mailman
+            os: ubuntu-2404
+          - suite: osqa
+            os: ubuntu-2404
+          - suite: otrs
+            os: ubuntu-2404
       fail-fast: false
     steps:
     - name: Login to GitHub Container Registry