diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml
index 962279db451..9f8fa7624b2 100644
--- a/.github/actions/prepare-gradle-build/action.yml
+++ b/.github/actions/prepare-gradle-build/action.yml
@@ -12,6 +12,12 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Free Disk Space
+      if: ${{ runner.os == 'Linux' }}
+      uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+      with:
+        large-packages: false
+        docker-images: false
     - name: Set Up Java
       uses: actions/setup-java@v4
       with:
diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index 6cc98154e92..787addc332e 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -8,7 +8,7 @@ concurrency:
 jobs:
   build-and-deploy-snapshot:
     name: Build and Deploy Snapshot
-    runs-on: ubuntu22-8-32-OSS
+    runs-on: ubuntu-latest
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     steps:
       - name: Check Out Code
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
index fc73d7b0856..2573dbea2e4 100644
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -7,9 +7,14 @@ permissions:
 jobs:
   build:
     name: Build Pull Request
-    runs-on: ubuntu22-8-32-OSS
+    runs-on: ubuntu-latest
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     steps:
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+        with:
+          large-packages: false
+          docker-images: false
       - name: Set Up JDK 17
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2c7a3beed1..ea93c453993 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - id: ubuntu22-8-32-OSS
+          - id: ubuntu-latest
             name: Linux
           - id: windows-latest
             name: Windows
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e0ab9fb3d88..0a127f422a6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-stage-release:
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     name: Build and Stage Release
-    runs-on: ubuntu22-8-32-OSS
+    runs-on: ubuntu-latest
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4
diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml
index aaea936217c..bd3cc5365df 100644
--- a/.github/workflows/run-system-tests.yml
+++ b/.github/workflows/run-system-tests.yml
@@ -8,7 +8,7 @@ concurrency:
 jobs:
   run-system-tests:
     name: 'Java ${{ matrix.java.version}}'
-    runs-on: ubuntu22-8-32-OSS
+    runs-on: ubuntu-latest
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     strategy:
       matrix: