diff --git a/.github/actions/build-app/action.yml b/.github/actions/build-app/action.yml
index a155f662..82d98a8a 100644
--- a/.github/actions/build-app/action.yml
+++ b/.github/actions/build-app/action.yml
@@ -32,15 +32,11 @@ runs:
           type=raw,value=${{ inputs.tag-prefix }}-${{ github.run_number }}-a${{ github.run_attempt }}
 
     - name: Build and push
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       with:
         context: .
         file: ${{ inputs.dockerfile }}
         push: ${{ inputs.push }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        platforms: ${{ inputs.platforms }}
-        cache-from: |
-          type=gha
-        cache-to: |
-          type=gha
\ No newline at end of file
+        platforms: ${{ inputs.platforms }}
\ No newline at end of file
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 79e30526..07ef992f 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -39,7 +39,7 @@ jobs:
 
   tests:
     name: Tests (${{ matrix.name }})
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     strategy:
       fail-fast: false
       matrix:
@@ -64,7 +64,7 @@ jobs:
 
   build:
     name: Build (${{ matrix.image }})
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     strategy:
       fail-fast: false
       matrix:
@@ -80,8 +80,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+      - name: Setup Blacksmith Builder
+        uses: useblacksmith/setup-docker-builder@v1
 
       - name: Log in to Container Registry
         uses: docker/login-action@v4
@@ -102,7 +102,7 @@ jobs:
   promote-image:
     name: Promote Image (${{ matrix.image }})
     needs: [build, tests]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     if: ${{ inputs.push || (github.ref_protected && github.event_name != 'pull_request') }}
     strategy:
       fail-fast: false
@@ -131,7 +131,7 @@ jobs:
           latest: ${{ inputs.latest || false }}
           
   deploy-prod-workflow:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     needs: promote-image
     if: ${{ github.ref_type == 'branch' && github.event_name != 'pull_request' && github.ref_name == 'master' }}
     environment: production
@@ -148,7 +148,7 @@ jobs:
             }
             
   deploy-staging:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     needs: promote-image
     if: ${{ github.ref_type == 'branch' && github.event_name != 'pull_request' && github.ref_name == 'develop' }}
     environment: staging
@@ -166,7 +166,7 @@ jobs:
             }
 
   deploy-dev:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     needs: promote-image
     if: ${{ github.ref_type == 'branch' && github.event_name != 'pull_request' && github.ref_name == 'develop' }}
     environment: development
diff --git a/.github/workflows/ci-tag.yml b/.github/workflows/ci-tag.yml
index 959050ce..d2c690d9 100644
--- a/.github/workflows/ci-tag.yml
+++ b/.github/workflows/ci-tag.yml
@@ -15,7 +15,7 @@ jobs:
 
   # Pre-job to find the latest tag
   get-latest-tag:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     outputs:
       latest-tag: ${{ steps.latest-tag.outputs.tag }}
     steps:
@@ -27,7 +27,7 @@ jobs:
           regex: '^\d+\.\d+\.\d+$'
           releases-only: false
 
-  # Delegate building and containerizing to a single workflow.
+  # Delegate building and containerizing to a single workflow
   build-and-containerize:
     needs: get-latest-tag
     uses: ./.github/workflows/ci-build.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d9cbb591..efe70d7c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   analyze:
     name: Analyze (csharp)
-    runs-on: 'ubuntu-latest'
+    runs-on: 'blacksmith-2vcpu-ubuntu-2404'
     permissions:
       # required for all workflows
       security-events: write
diff --git a/.github/workflows/update-cloudflare-proxies.yml b/.github/workflows/update-cloudflare-proxies.yml
index 9f9bb8e6..4834f329 100644
--- a/.github/workflows/update-cloudflare-proxies.yml
+++ b/.github/workflows/update-cloudflare-proxies.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   update-proxies:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
 
     steps:
       - uses: actions/checkout@v6