diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 54235de2fa..1eb513b1e9 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,7 +29,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners (GitHub.com only)
     # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'depot-ubuntu-22.04-16' }}
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       # required for all workflows
diff --git a/.github/workflows/router-ci.yaml b/.github/workflows/router-ci.yaml
index 5ae4e7a350..ed09fe5828 100644
--- a/.github/workflows/router-ci.yaml
+++ b/.github/workflows/router-ci.yaml
@@ -51,7 +51,10 @@ jobs:
 
       - uses: ./.github/actions/go
         with:
-          cache-dependency-path: router/go.sum
+          cache-dependency-path: |
+            router/go.sum
+            router-tests/go.sum
+            demo/go.sum
 
       - uses: ./.github/actions/go-mod-tidy
         with:
@@ -96,7 +99,7 @@ jobs:
   # that have access to the secrets
   build_test:
     if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 15
     services:
       redis:
@@ -123,19 +126,12 @@ jobs:
           username: ${{secrets.DOCKER_USERNAME}}
           password: ${{secrets.DOCKER_PASSWORD}}
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          # The go install / version instructions are inside the Makefile, so we need to cache the Makefile.
-          key: ${{ runner.os }}-go-${{ hashFiles('router/go.sum') }}-makefile-${{ hashFiles('Makefile') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
       - uses: ./.github/actions/go
         with:
-          cache-dependency-path: router/go.sum
+          cache-dependency-path: |
+            router/go.sum
+            router-tests/go.sum
+            demo/go.sum
 
       - uses: ./.github/actions/go-mod-tidy
         with:
@@ -177,7 +173,7 @@ jobs:
         run: make build
 
   build_push_image:
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-22.04-8
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4