diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index be1ddcd2..c09f904d 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -40,8 +40,8 @@ jobs:
       other_names_also: |
         devspaces
         devel
-        ee-amd64:tox -e ee:runner=devtools-multiarch-builder
-        ee-arm64:tox -e ee:runner=ubuntu-24.04-arm64-2core
+        ee-amd64:tox -e ee:runner=ubuntu-24.04
+        ee-arm64:tox -e ee:runner=ubuntu-24.04-arm
     secrets: inherit # needed for logging to the ghcr.io registry
 
   codeql:
diff --git a/pyproject.toml b/pyproject.toml
index 87e6fd95..ef5132fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -537,7 +537,11 @@ set_env.TERM = "dump"
 
 [tool.tox.env.ee]
 commands = [["python", "-m", "build", "--version"], ["./tools/ee.sh"]]
-commands_post = [["./tools/cleanup.sh"]]
+commands_post = [
+  ["podman", "system", "df"],
+  ["df", "-h"],
+  ["./tools/cleanup.sh"]
+]
 commands_pre = []
 dependency_groups = ["ee", "dev"]
 description = "Build the ee container image"
@@ -587,12 +591,14 @@ skip_install = true
 
 [tool.tox.env_run_base]
 allowlist_externals = [
+  "./tools/cleanup.sh",
+  "./tools/devspaces.sh",
+  "./tools/ee.sh",
+  "df",
   "git",
+  "podman",
   "rm",
   "sh",
-  "./tools/cleanup.sh",
-  "./tools/devspaces.sh",
-  "./tools/ee.sh"
 ]
 commands = [
   ["sh", "-c", "ansible --version | head -n 1"],
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index b382f7ad..cd1cd60f 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -1,6 +1,17 @@
 #!/bin/bash -e
+# cspell: ignore hhvm anthoscli
 set -eux pipefail
 
 if [[ -f "/usr/bin/apt-get" ]]; then
+    dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 20
+    df -h
+    echo "Removing large packages so GHA runners do not run out of disk space during image building"
+    sudo apt-get remove -y '^ghc-8.*' '^dotnet-.*' '^llvm-.*' 'php.*' azure-cli google-cloud-sdk hhvm google-chrome-stable google-cloud-cli google-cloud-cli-anthoscli firefox powershell mono-devel microsoft-edge-stable || true
+    sudo apt-get autoremove -y
     sudo apt-get install -y -q libonig-dev
+    sudo apt-get clean
+    sudo rm -rf /usr/share/dotnet/
+    df -h
+    podman info --format '{{ json .Store }}' | jq
+    podman system df
 fi