diff --git a/eng/ci/templates/jobs/run-docker-tests-linux.yml b/eng/ci/templates/jobs/run-docker-tests-linux.yml
index 44a5bd8e..9eb8fef8 100644
--- a/eng/ci/templates/jobs/run-docker-tests-linux.yml
+++ b/eng/ci/templates/jobs/run-docker-tests-linux.yml
@@ -9,7 +9,7 @@ jobs:
 
     pool:
       name: ${{ parameters.poolName }}
-      image: 1es-ubuntu-22.04
+      image: 1es-ubuntu-24.04-min
       os: linux
 
     strategy:
@@ -37,15 +37,21 @@ jobs:
         inputs:
           artifactsFeeds: upstream-public
       - bash: |
-          echo "=== disk BEFORE cleanup ==="
+          set +e
+          echo "=== disk ==="
           df -h /
-          echo "=== freeing space (toolsets this job does not use) ==="
-          sudo rm -rf /usr/local/lib/android /opt/ghc /usr/local/.ghcup /usr/share/swift \
-                      /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/PyPy 2>/dev/null || true
-          sudo apt-get clean || true
-          echo "=== disk AFTER cleanup ==="
-          df -h /
-        displayName: 'Free up disk space'
+          echo "=== toolchain ==="
+          for t in mvn java javac docker python3 node npm dotnet; do
+            printf '%-10s %s\n' "$t" "$(command -v $t 2>/dev/null || echo MISSING)"
+          done
+          echo "=== /opt/hostedtoolcache ==="
+          ls -1 /opt/hostedtoolcache 2>/dev/null || echo "(absent)"
+          echo "=== JDKs (/usr/lib/jvm) ==="
+          ls -1 /usr/lib/jvm 2>/dev/null || echo "(none)"
+          echo "=== docker daemon ==="
+          docker info >/dev/null 2>&1 && echo "available" || echo "NOT available"
+          exit 0
+        displayName: 'Probe: disk + toolchain'
 
       - bash: |
           mvn --version
diff --git a/eng/ci/templates/jobs/run-emulated-tests-linux.yml b/eng/ci/templates/jobs/run-emulated-tests-linux.yml
index edb97da5..cddd86f3 100644
--- a/eng/ci/templates/jobs/run-emulated-tests-linux.yml
+++ b/eng/ci/templates/jobs/run-emulated-tests-linux.yml
@@ -9,7 +9,7 @@ jobs:
 
     pool:
       name: ${{ parameters.poolName }}
-      image: 1es-ubuntu-22.04
+      image: 1es-ubuntu-24.04-min
       os: linux
 
     variables:
@@ -57,18 +57,21 @@ jobs:
         inputs:
           artifactsFeeds: upstream-public
       - bash: |
-          echo "=== disk BEFORE cleanup ==="
+          set +e
+          echo "=== disk ==="
           df -h /
-          echo "=== top consumers on / (baseline) ==="
-          sudo du -xh --max-depth=2 / 2>/dev/null | sort -rh | head -20 || true
-          echo "=== freeing space (toolsets this job does not use) ==="
-          sudo rm -rf /usr/local/lib/android /opt/ghc /usr/local/.ghcup /usr/share/swift \
-                      /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/PyPy 2>/dev/null || true
-          docker image prune -af || true
-          sudo apt-get clean || true
-          echo "=== disk AFTER cleanup ==="
-          df -h /
-        displayName: 'Free up disk space'
+          echo "=== toolchain ==="
+          for t in mvn java javac docker python3 node npm dotnet; do
+            printf '%-10s %s\n' "$t" "$(command -v $t 2>/dev/null || echo MISSING)"
+          done
+          echo "=== /opt/hostedtoolcache ==="
+          ls -1 /opt/hostedtoolcache 2>/dev/null || echo "(absent)"
+          echo "=== JDKs (/usr/lib/jvm) ==="
+          ls -1 /usr/lib/jvm 2>/dev/null || echo "(none)"
+          echo "=== docker daemon ==="
+          docker info >/dev/null 2>&1 && echo "available" || echo "NOT available"
+          exit 0
+        displayName: 'Probe: disk + toolchain'
       - task: NuGetToolInstaller@1
         inputs:
           checkLatest: true