diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index e4088360..ecd6c926 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -26,7 +26,7 @@ env:
 jobs:
   build_and_publish_public_images:
     name: Build public basket images and push to Docker hub
-    runs-on: [self-hosted, nonprod, prod, us-central1, bedrock]
+    runs-on: ubuntu-latest
     outputs:
       long_sha: ${{ steps.sha.outputs.LONG_SHA }}
       short_sha: ${{ steps.sha.outputs.SHORT_SHA }}
@@ -85,7 +85,7 @@ jobs:
   push_image_to_gar:
     name: Push Image to GAR
     needs: build_and_publish_public_images
-    runs-on: [self-hosted, nonprod, prod, us-central1, bedrock]
+    runs-on: ubuntu-latest
     environment: build
     permissions:
       contents: read