diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc50e7c0..49febcec 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test-hello-world:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         idf_version:
@@ -50,7 +50,7 @@ jobs:
 
   run-tests:
     name: test-${{ matrix.test_name }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         test_name:
@@ -100,7 +100,7 @@ jobs:
 
   report:
     needs: [test-hello-world, run-tests]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: always()
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 78d000e9..b262fc62 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-and-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         version: [release-v5.0, release-v5.1, release-v5.2, release-v5.3, latest]