diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8a43c0520..8affb0d66 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -22,27 +22,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install rust toolchain
         run: rustup show
 
       - uses: actions-rs/install@v0.1
         with:
           crate: grcov
-          use-tool-cache: true
-
-      # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
-      # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
-      - name: Free up disk space on GitHub hosted runners
-        run: |
-          # Ensure context is GitHub hosted runner
-          # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
-          if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
-            echo "Freeing up space in GitHub hosted runner"
-            sudo rm -rf /usr/share/dotnet
-            sudo rm -rf /opt/ghc
-            sudo rm -rf "/usr/local/share/boost"
-            sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          fi
+          use-tool-cache: false
       
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1
@@ -58,4 +49,4 @@ jobs:
           fail_ci_if_error: true
           flags: tests
           verbose: true
-          name: unit-tests
\ No newline at end of file
+          name: unit-tests
diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml
index 967dc6510..6387503c2 100644
--- a/.github/workflows/migration.yml
+++ b/.github/workflows/migration.yml
@@ -17,4 +17,9 @@ jobs:
       - name: Install build tools
         run: ./scripts/init.sh
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       - run: ./scripts/runtime-upgrade/test_runtime_upgrade.sh ${{ github.event.inputs.block }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4d52a85ec..e88f9ffe5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -80,6 +80,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install build tools
         run: ./scripts/init.sh
 
@@ -101,6 +106,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install build tools
         run: ./scripts/init.sh
       
@@ -118,22 +128,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install build tools
         run: ./scripts/init.sh
-
-      # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
-      # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
-      - name: Free up disk space on GitHub hosted runners
-        run: |
-          # Ensure context is GitHub hosted runner
-          # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
-          if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
-            echo "Freeing up space in GitHub hosted runner"
-            sudo rm -rf /usr/share/dotnet
-            sudo rm -rf /opt/ghc
-            sudo rm -rf "/usr/local/share/boost"
-            sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          fi
       
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1
@@ -153,22 +154,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install build tools
         run: ./scripts/init.sh
-
-      # No disk space: https://github.com/zeitgeistpm/zeitgeist/actions/runs/5085081984/jobs/9144298675?pr=1006
-      # Workaround: https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
-      - name: Free up disk space on GitHub hosted runners
-        run: |
-          # Ensure context is GitHub hosted runner
-          # https://docs.github.com/en/actions/learn-github-actions/contexts#runner-context
-          if [[ "${{ runner.name }}" == "GitHub Actions"* ]]; then
-            echo "Freeing up space in GitHub hosted runner"
-            sudo rm -rf /usr/share/dotnet
-            sudo rm -rf /opt/ghc
-            sudo rm -rf "/usr/local/share/boost"
-            sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          fi
       
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1
@@ -188,6 +180,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
       - name: Install build tools
         run: ./scripts/init.sh
 
diff --git a/.github/workflows/try-runtime.yml b/.github/workflows/try-runtime.yml
index 676368afa..0d5d4b99d 100644
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -13,6 +13,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       - name: Install build tools
         run: ./scripts/init.sh
 
@@ -27,6 +32,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Free up disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       - name: Install build tools
         run: ./scripts/init.sh