diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8629a2eabe9..165387dc37c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,7 +20,7 @@ Please delete options that are not relevant.
 
 **Feature/Issue validation/testing**:
 
-Please describe the tests that you ran to verify your changes and relevent result summary. Provide instructions so it can be reproduced.
+Please describe the tests that you ran to verify your changes and relevant result summary. Provide instructions so it can be reproduced.
 Please also list any relevant details for your test configuration.
 
 - [ ] Test A
diff --git a/.github/actions/free-up-disk-space/action.yml b/.github/actions/free-up-disk-space/action.yml
new file mode 100644
index 00000000000..f8a0d42bd8a
--- /dev/null
+++ b/.github/actions/free-up-disk-space/action.yml
@@ -0,0 +1,34 @@
+name: 'Free-up disk space action'
+description: 'Removes non-essential tools, libraries and cached files from GitHub action runner node'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Free up disk space
+      shell: bash
+      run: |
+        echo "Disk usage before cleanup:"
+        df -h
+
+        # remove non-essential tools and libraries, see:
+        # https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
+        sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /usr/local/share/boost
+
+        # delete libraries for Android (12G), CodeQL (5.3G), PowerShell (1.3G), Swift (1.7G)
+        sudo rm -rf /usr/local/lib/android
+        sudo rm -rf "${AGENT_TOOLSDIRECTORY}/CodeQL"
+        sudo rm -rf /usr/local/share/powershell
+        sudo rm -rf /usr/share/swift
+
+        echo "Disk usage after cleanup:"
+        df -h
+
+    - name: Prune docker images
+      shell: bash
+      run: |
+        echo "Pruning docker images"
+        docker image prune -a -f
+        docker system df
+        df -h
diff --git a/.github/actions/minikube-setup/action.yml b/.github/actions/minikube-setup/action.yml
index da52f893c12..662b1ed5138 100644
--- a/.github/actions/minikube-setup/action.yml
+++ b/.github/actions/minikube-setup/action.yml
@@ -4,27 +4,6 @@ description: 'Sets up minikube on the github runner'
 runs:
   using: "composite"
   steps:
-    - name: Free up disk space
-      shell: bash
-      run: |
-        echo "Disk usage before cleanup:"
-        df -h
-
-        # remove non-essential tools and libraries, see:
-        # https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
-        sudo rm -rf /opt/ghc
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /usr/local/share/boost
-
-        # delete libraries for Android (12G), CodeQL (5.3G), PowerShell (1.3G), Swift (1.7G)
-        sudo rm -rf /usr/local/lib/android
-        sudo rm -rf "${AGENT_TOOLSDIRECTORY}/CodeQL"
-        sudo rm -rf /usr/local/share/powershell
-        sudo rm -rf /usr/share/swift
-
-        echo "Disk usage after cleanup:"
-        df -h
-
     - name: Install kubectl
       uses: azure/setup-kubectl@v3
       with:
@@ -42,11 +21,3 @@ runs:
     - name: Check Kubernetes pods
       shell: bash
       run: kubectl get pods -n kube-system
-
-    - name: Prune docker images
-      shell: bash
-      run: |
-        echo "Pruning docker images"
-        docker image prune -a -f
-        docker system df
-        df -h
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index ee75398613b..57594738651 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -62,6 +62,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
       - name: Build runtime server images
         run: |
           ./test/scripts/gh-actions/build-server-runtimes.sh predictor,transformer
@@ -147,6 +150,9 @@ jobs:
         with:
           python-version: '3.9'
 
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
       - name: Setup Minikube
         uses: ./.github/actions/minikube-setup
 
@@ -227,6 +233,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -285,6 +292,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -337,7 +345,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
-          
+
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -390,6 +399,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -442,6 +452,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -503,6 +514,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -541,6 +553,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
       - uses: ./.github/actions/base-download
@@ -584,6 +597,7 @@ jobs:
         with:
           python-version: '3.9'
 
+      - uses: ./.github/actions/free-up-disk-space
       - uses: ./.github/actions/minikube-setup
       - uses: ./.github/actions/kserve-dep-setup
         with: