diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6dcb018..ba7c63e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
         puppet_version: [7]
 
     name: Check / Puppet ${{ matrix.puppet_version }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: puppet/pdk:latest
 
     steps:
@@ -39,11 +39,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['rocky8', 'ub2204', 'deb11']
+        os: ['rocky8', 'ub2204', 'ub2404', 'deb11', 'deb12']
         puppet_version: [7]
 
     name: Acceptance / ${{ matrix.os }} / Puppet ${{ matrix.puppet_version }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - check
 
diff --git a/metadata.json b/metadata.json
index 5668190..f76a6e1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -45,14 +45,16 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     }
   ],