diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 489b9e52..4fe3f2ea 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -12,27 +12,10 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  #ubuntu-20-04:
-    #strategy:
-      #matrix:
-        #target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
-    #runs-on: ubuntu-20.04
-    #steps:
-      #- uses: actions/checkout@v3
-        #with:
-          #submodules: recursive
-      #- uses: distrho/dpf-cmake-action@v1
-        #with:
-          #target: ${{ matrix.target }}
-          #dpf_path: .
-
   ubuntu-22-04:
-    env:
-      TARGET_SUFFIX: _22_04
     strategy:
       matrix:
         target: [linux-arm64, linux-armhf, linux-i686, linux-x86_64, win32, win64, pluginval]
-        # linux-riscv64,
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -40,12 +23,26 @@ jobs:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
+          dpf_path: .
+          suffix: _22_04
           target: ${{ matrix.target }}
+
+  ubuntu-24-04:
+    strategy:
+      matrix:
+        target: [linux-arm64, linux-armhf, linux-riscv64, linux-x86_64, pluginval]
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: distrho/dpf-cmake-action@v1
+        with:
           dpf_path: .
+          suffix: _24_04
+          target: ${{ matrix.target }}
 
   macos-12:
-    env:
-      TARGET_SUFFIX: _12
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
@@ -56,12 +53,11 @@ jobs:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
-          target: ${{ matrix.target }}
           dpf_path: .
+          suffix: _12
+          target: ${{ matrix.target }}
 
   macos-13:
-    env:
-      TARGET_SUFFIX: _13
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
@@ -72,12 +68,11 @@ jobs:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
-          target: ${{ matrix.target }}
           dpf_path: .
+          suffix: _13
+          target: ${{ matrix.target }}
 
   macos-14:
-    env:
-      TARGET_SUFFIX: _14
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
@@ -88,8 +83,9 @@ jobs:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
-          target: ${{ matrix.target }}
           dpf_path: .
+          suffix: _14
+          target: ${{ matrix.target }}
 
   cmake_win32:
     runs-on: windows-2019
diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml
index 9ccdc412..8ac77fcc 100644
--- a/.github/workflows/example-plugins.yml
+++ b/.github/workflows/example-plugins.yml
@@ -9,25 +9,10 @@ on:
       - '*'
 
 jobs:
-  #ubuntu-20-04:
-    #strategy:
-      #matrix:
-        #target: [linux-arm64, linux-armhf, linux-i686, linux-riscv64, linux-x86_64, win32, win64, pluginval]
-    #runs-on: ubuntu-20.04
-    #steps:
-      #- uses: actions/checkout@v3
-        #with:
-          #submodules: recursive
-      #- uses: distrho/dpf-makefile-action@v1
-        #with:
-          #dpf_path: .
-          #target: ${{ matrix.target }}
-
   ubuntu-22-04:
     strategy:
       matrix:
         target: [linux-arm64, linux-armhf, linux-i686, linux-x86_64, win32, win64, pluginval]
-        # linux-riscv64,
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -36,6 +21,22 @@ jobs:
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
+          suffix: _22_04
+          target: ${{ matrix.target }}
+
+  ubuntu-24-04:
+    strategy:
+      matrix:
+        target: [linux-arm64, linux-armhf, linux-x86_64, pluginval]
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: distrho/dpf-makefile-action@v1
+        with:
+          dpf_path: .
+          suffix: _24_04
           target: ${{ matrix.target }}
 
   macos-12:
@@ -50,6 +51,7 @@ jobs:
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
+          suffix: _12
           target: ${{ matrix.target }}
 
   macos-13:
@@ -64,6 +66,7 @@ jobs:
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
+          suffix: _13
           target: ${{ matrix.target }}
 
   macos-14:
@@ -78,4 +81,5 @@ jobs:
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
+          suffix: _14
           target: ${{ matrix.target }}