diff --git a/.github/workflows/build-push-edge-debug.yaml b/.github/workflows/build-push-edge-debug.yaml
index cf58b5d65..2833e3c31 100644
--- a/.github/workflows/build-push-edge-debug.yaml
+++ b/.github/workflows/build-push-edge-debug.yaml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -36,6 +36,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: parseable/parseable
+      
+      - name: Clean up builder cache
+        run: docker builder prune -f
 
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/.github/workflows/build-push-edge-kafka.yaml b/.github/workflows/build-push-edge-kafka.yaml
index b36f2dc38..ea295fbc6 100644
--- a/.github/workflows/build-push-edge-kafka.yaml
+++ b/.github/workflows/build-push-edge-kafka.yaml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -58,3 +58,6 @@ jobs:
           platforms: linux/arm64
           build-args: |
             LIB_DIR=aarch64-linux-gnu
+      
+      - name: Clean up builder cache
+        run: docker builder prune -f
diff --git a/.github/workflows/build-push-edge.yaml b/.github/workflows/build-push-edge.yaml
index a774739ec..0266f76cf 100644
--- a/.github/workflows/build-push-edge.yaml
+++ b/.github/workflows/build-push-edge.yaml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4756fd5b1..df5443454 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -348,7 +348,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build-push-docker-image:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -403,3 +403,6 @@ jobs:
           platforms: linux/arm64
           build-args: |
             LIB_DIR=aarch64-linux-gnu
+      
+      - name: Clean up builder cache
+        run: docker builder prune -f