diff --git a/cleanup.sh b/cleanup.sh
index 3a88827..30aafe1 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -10,7 +10,7 @@
 # Intentionally not using set -e: individual cleanup failures should not
 # prevent other cleanups from running.
 #
-# KEEP: /root/.bun, /root/.npm, /root/.cache/pnpm, /root/.cache/yarn,
+# KEEP: $HOME/.bun, $HOME/.npm, $HOME/.cache/pnpm, $HOME/.cache/yarn,
 #       Gradle modules-2 / build-cache-* / transforms-*, Cargo registry.
 # DELETE: /tmp contents except $RUNNER_WORKDIR (and $RUNNER_TEMP if under
 #         /tmp), Gradle daemon/journals/locks, runner _diag logs.
@@ -88,17 +88,18 @@ lru_cap() {
 clean_tmp
 
 # Gradle daemon / journals / locks only. Keep modules-2, build-cache-*,
-# transforms-*.
-rm -rf /root/.gradle/daemon/ 2>/dev/null || true
-rm -rf /root/.gradle/caches/journal-* 2>/dev/null || true
-find /root/.gradle -name '*.lock' -delete 2>/dev/null || true
+# transforms-*. $HOME covers both the root (default) and RUN_AS_ROOT=false
+# (/home/runner) runner users.
+rm -rf "$HOME"/.gradle/daemon/ 2>/dev/null || true
+rm -rf "$HOME"/.gradle/caches/journal-* 2>/dev/null || true
+find "$HOME"/.gradle -name '*.lock' -delete 2>/dev/null || true
 
 # Runner diagnostic logs
 find /actions-runner/_diag -name '*.log' -delete 2>/dev/null || true
 find /runner-data/_diag -name '*.log' -delete 2>/dev/null || true
 
-lru_cap /root/.gradle
-lru_cap /root/.bun
+lru_cap "$HOME"/.gradle
+lru_cap "$HOME"/.bun
 
 AFTER=$(df -h / | awk 'NR==2 {print $4}')
 echo "[cleanup] Post-job cleanup complete. Disk free: ${BEFORE} -> ${AFTER}"
diff --git a/pre-job.sh b/pre-job.sh
index b1384de..3149263 100755
--- a/pre-job.sh
+++ b/pre-job.sh
@@ -20,12 +20,12 @@ echo "[pre-job] Surgical prune of incomplete cache entries..."
 # Bun: a killed job leaves partial tarballs (*.tmp / *.part). The next job
 # then fails with "Fail extracting tarball for ..." and it looks like a
 # dependency problem rather than a runner problem.
-find /root/.bun/install/cache \( -name '*.tmp' -o -name '*.part' \) -delete 2>/dev/null || true
+find "$HOME"/.bun/install/cache \( -name '*.tmp' -o -name '*.part' \) -delete 2>/dev/null || true
 
 # Gradle: leftover lock / journal / daemon state from a killed compile.
 # Keep modules-2, build-cache-*, and transforms-*.
-rm -f /root/.gradle/caches/modules-2/modules-2.lock 2>/dev/null || true
-rm -rf /root/.gradle/caches/journal-* 2>/dev/null || true
-rm -rf /root/.gradle/daemon/ 2>/dev/null || true
+rm -f "$HOME"/.gradle/caches/modules-2/modules-2.lock 2>/dev/null || true
+rm -rf "$HOME"/.gradle/caches/journal-* 2>/dev/null || true
+rm -rf "$HOME"/.gradle/daemon/ 2>/dev/null || true
 
 echo "[pre-job] Prune complete."