diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml
index 49b876d1ad..7dccbeb624 100644
--- a/.github/workflows/build-steps.yml
+++ b/.github/workflows/build-steps.yml
@@ -95,6 +95,10 @@ jobs:
     container:
       image: ${{ inputs.container }}
       volumes: ${{ fromJson( inputs.container_volumes ) }}
+      options: -v /:/host/root ${{ (contains(inputs.runner, 'gpu') && '-e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all') || '-e A=x' }}
+      # Extra options:
+      # - Ensure the GPU runners have OptiX is visible in the container.
+      # - Mount the native filesystem under /host/root
     env:
       CXX: ${{inputs.cxx_compiler}}
       CC: ${{inputs.cc_compiler}}
diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
index 7ce0c8e4f8..fb1d2b8213 100755
--- a/src/build-scripts/gh-installdeps.bash
+++ b/src/build-scripts/gh-installdeps.bash
@@ -7,7 +7,14 @@
 
 
 set -ex
-df -h
+
+# Make extra space on the runners
+df -h .
+time rm -rf /usr/local/lib/android /host/root/usr/local/lib/android &
+sleep 3
+# rather than block, delete in background, but give it a few secs to start
+# clearing things out before moving on.
+# Other candidates, if we need it: /usr/share/dotnet /usr/local/.ghcup
 
 
 #
@@ -219,7 +226,8 @@ if [[ "$USE_ICC" != "" ]] ; then
     export CC=icc
 fi
 
-df -h
+df -h .
+df -h /host/root || true
 
 # Save the env for use by other stages
 src/build-scripts/save-env.bash