diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 30865544..72db1063 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -43,7 +43,7 @@ jobs:
   addlicense:
     name: verify licenses
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -63,7 +63,7 @@ jobs:
   buildifier:
     name: check format with buildifier
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -83,7 +83,7 @@ jobs:
   rules_rust:
     name: check format with rules_rust
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -106,7 +106,7 @@ jobs:
   clang_format:
     name: check format with clang-format
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -122,7 +122,7 @@ jobs:
   clang_tidy:
     name: check format with clang-tidy
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d75dcd1..4315a740 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,9 +43,14 @@ jobs:
   test_data:
     name: build test data
 
-    runs-on: ubuntu-24.04-16core
+    runs-on: ubuntu-24.04
 
     steps:
+    - name: Free up disk space
+      run: |
+        sudo rm -rf /usr/share/dotnet /usr/share/swift /usr/local/.ghcup /usr/local/julia* /usr/local/lib/android /usr/local/share/chromium /opt/microsoft /opt/google /usr/lib/firefox /opt/hostedtoolcache
+        echo "Free disk space: " $(df -h /)
+
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
@@ -96,19 +101,19 @@ jobs:
         include:
         - name: 'NullVM on Linux/x86_64'
           engine: 'null'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=gcc
         - name: 'NullVM on Linux/x86_64 with ASan'
           engine: 'null'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --config=clang-asan --define=crypto=system
         - name: 'NullVM on Linux/x86_64 with TSan'
           engine: 'null'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --config=clang-tsan
@@ -121,7 +126,7 @@ jobs:
         - name: 'V8 on Linux/x86_64'
           engine: 'v8'
           repo: 'v8'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --define=crypto=system
@@ -129,7 +134,7 @@ jobs:
         - name: 'V8 on Linux/x86_64 with ASan'
           engine: 'v8'
           repo: 'v8'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --config=clang-asan
@@ -137,7 +142,7 @@ jobs:
         - name: 'V8 on Linux/x86_64 with TSan'
           engine: 'v8'
           repo: 'v8'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --config=clang-tsan
@@ -145,7 +150,7 @@ jobs:
         - name: 'V8 on Linux/x86_64 with GCC'
           engine: 'v8'
           repo: 'v8'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=gcc
@@ -170,7 +175,7 @@ jobs:
         - name: 'WAMR interp on Linux/x86_64'
           engine: 'wamr-interp'
           repo: 'com_github_bytecodealliance_wasm_micro_runtime'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm
@@ -184,7 +189,7 @@ jobs:
         - name: 'WAMR jit on Linux/x86_64'
           engine: 'wamr-jit'
           repo: 'com_github_bytecodealliance_wasm_micro_runtime'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm
@@ -201,7 +206,7 @@ jobs:
         - name: 'WasmEdge on Linux/x86_64'
           engine: 'wasmedge'
           repo: 'com_github_wasmedge_wasmedge'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm
@@ -215,14 +220,14 @@ jobs:
         - name: 'Wasmtime on Linux/x86_64'
           engine: 'wasmtime'
           repo: 'com_github_bytecodealliance_wasmtime'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm -c opt
         - name: 'Wasmtime on Linux/x86_64 with ASan'
           engine: 'wasmtime'
           repo: 'com_github_bytecodealliance_wasmtime'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: x86_64
           action: test
           flags: --config=hermetic-llvm --config=clang-asan --define=crypto=system
@@ -236,7 +241,7 @@ jobs:
         - name: 'Wasmtime on Linux/s390x'
           engine: 'wasmtime'
           repo: 'com_github_bytecodealliance_wasmtime'
-          os: ubuntu-24.04-16core
+          os: ubuntu-24.04
           arch: s390x
           action: test
           flags: --config=clang --test_timeout=1800
@@ -252,6 +257,12 @@ jobs:
           flags: --config=hermetic-llvm
 
     steps:
+    - name: Free up disk space
+      if: ${{ matrix.deps != '' && startsWith(matrix.os, 'ubuntu') }}
+      run: |
+        sudo rm -rf /usr/share/dotnet /usr/share/swift /usr/local/.ghcup /usr/local/julia* /usr/local/lib/android /usr/local/share/chromium /opt/microsoft /opt/google /usr/lib/firefox /opt/hostedtoolcache
+        echo "Free disk space: " $(df -h /)
+
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Compute job hash