diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 5af034904f..e3942091c8 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -16,15 +16,6 @@ env:
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
-    tags:
-      - "v*"
-    paths-ignore:
-      - docs/**
-      - chart/**
-      - .github/workflows/**
 
 jobs:
   oss-build:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 229496bf72..331f0227a7 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   lint:
-    runs-on: depot-ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
index 1575fe6b09..affa5c8861 100644
--- a/.github/workflows/helm.yml
+++ b/.github/workflows/helm.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   lint:
-    runs-on: depot-ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
@@ -32,7 +32,7 @@ jobs:
         run: helm template obot chart --namespace obot --set dev.useEmbeddedDb=true
 
   build:
-    runs-on: depot-ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml
index 66897cf78b..0897e4971b 100644
--- a/.github/workflows/test-docker-build.yml
+++ b/.github/workflows/test-docker-build.yml
@@ -1,34 +1,30 @@
 name: Test Docker Build
 on:
-  pull_request:
-    branches:
-      - main
-    paths-ignore:
-      - docs/**
-      - chart/**
+  workflow_dispatch:
 
 env:
-  BASE_IMAGE: ghcr.io/accelerate-data/obot/base:latest
   PROVIDERS_IMAGE: ghcr.io/accelerate-data/providers-vibedata:latest
   ENCRYPTION_BINS_IMAGE: ghcr.io/accelerate-data/providers-vibedata/encryption-bins:latest
 
 jobs:
   build:
-    runs-on: depot-ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Depot
-        uses: depot/setup-action@v1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Build Docker Image
-        uses: depot/build-push-action@v1
+        uses: docker/build-push-action@v6
         with:
-          project: bbqjs4tj1g
           context: .
+          push: false
           platforms: linux/amd64,linux/arm64
           build-args: |
-            BASE_IMAGE=${{ env.BASE_IMAGE }}
             PROVIDERS_IMAGE=${{ env.PROVIDERS_IMAGE }}
             ENCRYPTION_BINS_IMAGE=${{ env.ENCRYPTION_BINS_IMAGE }}
diff --git a/.github/workflows/user-ui.yml b/.github/workflows/user-ui.yml
index 68f6c7b841..6b25660c61 100644
--- a/.github/workflows/user-ui.yml
+++ b/.github/workflows/user-ui.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   lint:
-    runs-on: depot-ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code