diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
index a6f9a87f..cec348b7 100644
--- a/.github/workflows/mvn.yml
+++ b/.github/workflows/mvn.yml
@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        os: [ubuntu-24.04, windows-latest, macos-latest]
+        os: [ubuntu-24.04, windows-2022, macos-15]
         java: [11, 17, 21]
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 06564dc4..579a2f4a 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -31,7 +31,7 @@ name: shellcheck
 jobs:
   shellcheck:
     timeout-minutes: 15
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run ShellCheck