diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb304aa6..cbb6cfd4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [17-jdk, 21-jdk]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
       options: --user root
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4c398c74..2dcf2bd6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 on: [workflow_dispatch] # Manual trigger
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:21-jdk
       options: --user root