diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml
index 963396b8d..38724d737 100644
--- a/.github/workflows/ecosystem-tools.yaml
+++ b/.github/workflows/ecosystem-tools.yaml
@@ -21,6 +21,7 @@ jobs:
         with:
           cache: false
           go-version: 1.20.x
+      - uses: ./.github/actions/clean-runner
       - name: Install dependencies
         run: |
           cd $GITHUB_WORKSPACE
@@ -52,6 +53,21 @@ jobs:
           make bin/dex
           ./bin/dex serve $GITHUB_WORKSPACE/test/dex/config-dev.yaml &
           cd $GITHUB_WORKSPACE
+      - name: Check disk space before build
+        run: |
+          cd $GITHUB_WORKSPACE
+          set -x
+          df -h
+          sudo ls -lRh /tmp/* || true
+          sudo du -sh /tmp || true
+          sudo du -sh /tmp/* || true
+          sudo find /tmp/ -size +5M | sudo xargs ls -lh
+          du -sh ./* || true
+          find ./ -size +5M   | xargs ls -lh
+          sudo du -sh /var/
+          sudo du -sh /var/lib/docker/
+          du -sh /home/runner/work/
+          set +x
       - name: Run referrers tests
         run: |
             make test-bats-referrers
@@ -95,3 +111,19 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: fake
           AWS_SECRET_ACCESS_KEY: fake
+      - name: Check disk space after build
+        if: always()
+        run: |
+          cd $GITHUB_WORKSPACE
+          set -x
+          df -h
+          sudo ls -lRh /tmp/* || true
+          sudo du -sh /tmp || true
+          sudo du -sh /tmp/* || true
+          sudo find /tmp/ -size +5M | sudo xargs ls -lh
+          du -sh ./* || true
+          find ./ -size +5M   | xargs ls -lh
+          sudo du -sh /var/
+          sudo du -sh /var/lib/docker/
+          du -sh /home/runner/work/
+          set +x
\ No newline at end of file
diff --git a/test/blackbox/annotations.bats b/test/blackbox/annotations.bats
index 2526be0f3..64e49c9f6 100644
--- a/test/blackbox/annotations.bats
+++ b/test/blackbox/annotations.bats
@@ -24,7 +24,8 @@ function setup_file() {
         "port": "8080"
     },
     "log": {
-        "level": "debug"
+        "level": "debug",
+        "output": "${BATS_FILE_TMPDIR}/zot.log"
     },
     "extensions":{
         "search": {
@@ -57,6 +58,7 @@ EOF
 }
 
 function teardown_file() {
+    cat ${BATS_FILE_TMPDIR}/zot.log >&3
     local zot_root_dir=${BATS_FILE_TMPDIR}/zot
     local oci_data_dir=${BATS_FILE_TMPDIR}/oci
     local roots_data_dir=${BATS_FILE_TMPDIR}/roots