diff --git a/.github/workflows/agent_build_publish.yaml b/.github/workflows/agent_build_publish.yaml
index 6223f9ade6..37540c73bb 100644
--- a/.github/workflows/agent_build_publish.yaml
+++ b/.github/workflows/agent_build_publish.yaml
@@ -9,7 +9,7 @@ permissions:
 jobs:
   build:
     name: Build Agent
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Get Version
diff --git a/.github/workflows/apply-issue-labels-to-pr.yml b/.github/workflows/apply-issue-labels-to-pr.yml
index fa3ec979cd..0b030e32a7 100644
--- a/.github/workflows/apply-issue-labels-to-pr.yml
+++ b/.github/workflows/apply-issue-labels-to-pr.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   label_on_pr:
     if: github.event.pull_request.draft == false
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: none
       issues: read
diff --git a/.github/workflows/autofix.ci.yaml b/.github/workflows/autofix.ci.yaml
index efc9625934..df406691e1 100644
--- a/.github/workflows/autofix.ci.yaml
+++ b/.github/workflows/autofix.ci.yaml
@@ -8,7 +8,7 @@ permissions:
 jobs:
   autofix:
     if: github.event.pull_request.draft == false || github.event_name != 'pull_request'
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup pnpm
@@ -37,7 +37,7 @@ jobs:
   lint_docs:
     name: Docs
     if: github.event.pull_request.draft == false || github.event_name != 'pull_request'
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Lint main docs
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f4f39c9039..bd0fd1d5e2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ permissions:
 jobs:
   build:
     name: Build
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Run containers
diff --git a/.github/workflows/check_quotas.yml b/.github/workflows/check_quotas.yml
index 6c952d6a3e..67b8700e16 100644
--- a/.github/workflows/check_quotas.yml
+++ b/.github/workflows/check_quotas.yml
@@ -10,7 +10,7 @@ jobs:
   quota-check:
     environment: operations
     name: Check quota usage
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index c0c0aba0de..dbe1b916c3 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -62,9 +62,9 @@ jobs:
     secrets:
       CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
   mintlify_deployment:
+    runs-on: ubuntu-latest
     needs:
       - api_production_deployment
-    runs-on: blacksmith-4vcpu-ubuntu-2404
     name: Deploy docs
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/deploy_trigger.yaml b/.github/workflows/deploy_trigger.yaml
index acace6d4a8..a1b1b6b031 100644
--- a/.github/workflows/deploy_trigger.yaml
+++ b/.github/workflows/deploy_trigger.yaml
@@ -3,7 +3,7 @@ on:
   workflow_call:
 jobs:
   deploy_trigger:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node (minimal for pnpx)
diff --git a/.github/workflows/ghcr_retention_policy.yaml b/.github/workflows/ghcr_retention_policy.yaml
index 77615fcd53..b28a186cec 100644
--- a/.github/workflows/ghcr_retention_policy.yaml
+++ b/.github/workflows/ghcr_retention_policy.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   clean:
     environment: operations
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     name: Delete old test images
     steps:
       - uses: snok/container-retention-policy@v3.0.0
diff --git a/.github/workflows/job_build_agent_image.yaml b/.github/workflows/job_build_agent_image.yaml
index 108108f71f..51465bcf13 100644
--- a/.github/workflows/job_build_agent_image.yaml
+++ b/.github/workflows/job_build_agent_image.yaml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   build:
     name: Build Agent
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Get Version
diff --git a/.github/workflows/job_deploy_api_canary.yaml b/.github/workflows/job_deploy_api_canary.yaml
index 8ba2299917..1f118d8823 100644
--- a/.github/workflows/job_deploy_api_canary.yaml
+++ b/.github/workflows/job_deploy_api_canary.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   deploy:
     environment: Canary
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/job_deploy_api_enterprise.yaml b/.github/workflows/job_deploy_api_enterprise.yaml
index 7a51114c06..677baa2290 100644
--- a/.github/workflows/job_deploy_api_enterprise.yaml
+++ b/.github/workflows/job_deploy_api_enterprise.yaml
@@ -9,12 +9,16 @@ on:
         description: "Cloudflare API Token"
 jobs:
   deploy:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     environment: Enterprise
     strategy:
       fail-fast: true
       matrix:
-        workers: [{name: "enterprise-default", domain: "enterprise.unkey.dev"}, {name: "enterprise-fireworks", domain: "fireworks.unkey.dev"}]
+        workers:
+          [
+            { name: "enterprise-default", domain: "enterprise.unkey.dev" },
+            { name: "enterprise-fireworks", domain: "fireworks.unkey.dev" },
+          ]
     name: Deploy ${{ matrix.workers.domain }}
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/job_deploy_api_production.yaml b/.github/workflows/job_deploy_api_production.yaml
index 7415342565..bdec502711 100644
--- a/.github/workflows/job_deploy_api_production.yaml
+++ b/.github/workflows/job_deploy_api_production.yaml
@@ -10,7 +10,7 @@ jobs:
       contents: read
       deployments: write
     environment: Production
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/job_deploy_api_staging.yaml b/.github/workflows/job_deploy_api_staging.yaml
index 9240064231..8cff2176c6 100644
--- a/.github/workflows/job_deploy_api_staging.yaml
+++ b/.github/workflows/job_deploy_api_staging.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   deploy:
     environment: Preview
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/job_deploy_logdrain_production.yaml b/.github/workflows/job_deploy_logdrain_production.yaml
index abcf363f15..938e235424 100644
--- a/.github/workflows/job_deploy_logdrain_production.yaml
+++ b/.github/workflows/job_deploy_logdrain_production.yaml
@@ -10,7 +10,7 @@ jobs:
       contents: read
       deployments: write
     environment: Production
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/job_deploy_workflows.yaml b/.github/workflows/job_deploy_workflows.yaml
index c49cc4a6ec..c894450743 100644
--- a/.github/workflows/job_deploy_workflows.yaml
+++ b/.github/workflows/job_deploy_workflows.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   deploy:
     environment: Production
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/job_detect_changes.yaml b/.github/workflows/job_detect_changes.yaml
index 973683a18d..355795e865 100644
--- a/.github/workflows/job_detect_changes.yaml
+++ b/.github/workflows/job_detect_changes.yaml
@@ -40,7 +40,7 @@ permissions:
 jobs:
   build:
     name: Detect Changes
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     outputs:
       api: ${{ steps.changes.outputs.api }}
       dashboard: ${{ steps.changes.outputs.dashboard }}
diff --git a/.github/workflows/job_test_api_canary.yaml b/.github/workflows/job_test_api_canary.yaml
index f951a40725..a41a01b184 100644
--- a/.github/workflows/job_test_api_canary.yaml
+++ b/.github/workflows/job_test_api_canary.yaml
@@ -21,7 +21,7 @@ jobs:
     environment: Canary
     name: API Test Canary
     timeout-minutes: 60
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/job_test_api_local.yaml b/.github/workflows/job_test_api_local.yaml
index 50f36e4f57..031fdf9edb 100644
--- a/.github/workflows/job_test_api_local.yaml
+++ b/.github/workflows/job_test_api_local.yaml
@@ -6,10 +6,12 @@ permissions:
 jobs:
   test:
     name: API Test Local
-    timeout-minutes: 60
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    timeout-minutes: 25
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
       - name: Delete huge unnecessary tools folder
         run: rm -rf /opt/hostedtoolcache
       - name: Run containers
diff --git a/.github/workflows/job_test_api_staging.yaml b/.github/workflows/job_test_api_staging.yaml
index 1346b09645..d3fe160ecc 100644
--- a/.github/workflows/job_test_api_staging.yaml
+++ b/.github/workflows/job_test_api_staging.yaml
@@ -21,7 +21,7 @@ jobs:
     name: API Test Staging
     environment: Preview
     timeout-minutes: 60
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/job_test_go_api_local.yaml b/.github/workflows/job_test_go_api_local.yaml
index e63605b35b..1362b53c16 100644
--- a/.github/workflows/job_test_go_api_local.yaml
+++ b/.github/workflows/job_test_go_api_local.yaml
@@ -6,8 +6,8 @@ permissions:
 jobs:
   tests:
     name: Test
-    runs-on: blacksmith-8vcpu-ubuntu-2404
-    timeout-minutes: 15
+    runs-on: blacksmith-16vcpu-ubuntu-2404
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go
@@ -18,6 +18,8 @@ jobs:
         run: |
           go install github.com/mfridman/tparse@v0.14.0
         working-directory: go
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
       - name: Test
         run: make test-full
         working-directory: go
diff --git a/.github/workflows/job_test_unit.yaml b/.github/workflows/job_test_unit.yaml
index 87a4b28623..18fac8ad7b 100644
--- a/.github/workflows/job_test_unit.yaml
+++ b/.github/workflows/job_test_unit.yaml
@@ -6,7 +6,7 @@ permissions:
 jobs:
   test:
     name: Test
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index aea4cb83e3..2a8801c659 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ permissions:
 concurrency: release
 jobs:
   goreleaser:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs:
         uses: ./.github/actions/setup-node
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          install: 'false'
+          install: "false"
       - name: Setup Go
         uses: ./.github/actions/setup-go
         with:
diff --git a/.github/workflows/runbook-freshness-check.yaml b/.github/workflows/runbook-freshness-check.yaml
index 26af98c9c2..24961b9f84 100644
--- a/.github/workflows/runbook-freshness-check.yaml
+++ b/.github/workflows/runbook-freshness-check.yaml
@@ -17,11 +17,11 @@ permissions:
 on:
   schedule:
     # Run daily at 9 AM UTC
-    - cron: '0 9 * * *'
+    - cron: "0 9 * * *"
   workflow_dispatch: # Allow manual trigger
 jobs:
   check-runbook-freshness:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     # Security: Set timeout to prevent runaway workflows
     timeout-minutes: 10
     # Security: Restrict environment access
diff --git a/.github/workflows/semantic-pull-requests.yaml b/.github/workflows/semantic-pull-requests.yaml
index ce83eb642a..5fa97cdd70 100644
--- a/.github/workflows/semantic-pull-requests.yaml
+++ b/.github/workflows/semantic-pull-requests.yaml
@@ -12,7 +12,7 @@ jobs:
   validate-pr:
     name: PR title
     if: github.event.pull_request.draft == false
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: amannn/action-semantic-pull-request@v5
         id: lint_pr_title
diff --git a/deployment/docker-compose.yaml b/deployment/docker-compose.yaml
index 7031d8a098..6bc4f71589 100644
--- a/deployment/docker-compose.yaml
+++ b/deployment/docker-compose.yaml
@@ -27,9 +27,7 @@ services:
 
   planetscale:
     container_name: planetscale
-    build:
-      context: https://github.com/mattrobenolt/ps-http-sim.git
-      target: local
+    image: ghcr.io/mattrobenolt/ps-http-sim:v0.0.12
     command:
       [
         "-listen-port=3900",
@@ -118,25 +116,6 @@ services:
       VAULT_MASTER_KEYS: "Ch9rZWtfMmdqMFBJdVhac1NSa0ZhNE5mOWlLSnBHenFPENTt7an5MRogENt9Si6wms4pQ2XIvqNSIgNpaBenJmXgcInhu6Nfv2U="
       CLICKHOUSE_URL: "clickhouse://default:password@clickhouse:9000"
 
-  chproxy:
-    container_name: chproxy
-    build:
-      context: ../apps/chproxy
-      dockerfile: Dockerfile
-    deploy:
-      resources:
-        limits:
-          cpus: "1"
-          memory: 1024M
-    depends_on:
-      - clickhouse
-    environment:
-      PORT: 7123
-      CLICKHOUSE_URL: http://default:password@clickhouse:8123
-      BASIC_AUTH: proxy:password
-    ports:
-      - "7123:7123"
-
   clickhouse:
     image: bitnami/clickhouse:latest
     container_name: clickhouse
@@ -149,7 +128,19 @@ services:
     volumes:
       - clickhouse:/bitnami/clickhouse
     healthcheck:
-      test: ["CMD", "clickhouse-client", "--host", "localhost", "--user", "default", "--password", "password", "--query", "SELECT 1"]
+      test:
+        [
+          "CMD",
+          "clickhouse-client",
+          "--host",
+          "localhost",
+          "--user",
+          "default",
+          "--password",
+          "password",
+          "--query",
+          "SELECT 1",
+        ]
       timeout: 10s
       retries: 10
       start_period: 30s
diff --git a/go/Makefile b/go/Makefile
index 7e267dc6c2..c9a9e15aae 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -24,7 +24,7 @@ pull:
 	@docker compose -f ../deployment/docker-compose.yaml pull
 
 up:
-	@docker compose -f ../deployment/docker-compose.yaml up --force-recreate -d mysql redis clickhouse s3 otel
+	@docker compose -f ../deployment/docker-compose.yaml up --force-recreate -d mysql planetscale redis clickhouse s3 otel
 	@echo "Starting ClickHouse migrations (will retry if ClickHouse isn't ready)..."
 	@for i in {1..10}; do \
 		echo "Migration attempt $$i..."; \
@@ -43,7 +43,7 @@ down:
 test-full: export INTEGRATION_TEST=true
 test-full: export SIMULATION_TEST=false
 test-full: up
-	@echo "Running full tests... this can take more than 30min... run 'make test-unit' for faster tests"
+	@echo "Running full tests..."
 	@echo "Using $(PARALLEL_PROCS) parallel test processes"
 	@go test -json -failfast -timeout=15m -parallel=$(PARALLEL_PROCS) ./... | tparse -all -progress -smallscreen