diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
index c5d200b3841..b62ded018e5 100644
--- a/bazel/BUILD.bazel
+++ b/bazel/BUILD.bazel
@@ -122,7 +122,7 @@ platform(
     ],
     exec_properties = {
         "OSFamily": "Linux",
-        "Pool": "202305312341",
+        "Pool": "202504142133",
     },
 )
 
diff --git a/k8s/devinfra/buildbuddy-executor/README.md b/k8s/devinfra/buildbuddy-executor/README.md
index 3d8a6ce5dcd..3053ef8db5c 100644
--- a/k8s/devinfra/buildbuddy-executor/README.md
+++ b/k8s/devinfra/buildbuddy-executor/README.md
@@ -1,10 +1,13 @@
-Install buildbuddy executor to a k8s cluster:
-- `helm repo add buildbuddy https://helm.buildbuddy.io`
-- (For now not all changes to buildbuddy-executor have landed in the helm repo, so you should use my fork [here](https://github.com/JamesMBartlett/buildbuddy-helm/tree/all_changes_for_pixie) and replace any references to `buildbuddy/buildbuddy-executor` with `/path/to/checkout-of-fork/charts/buildbuddy-executor`)
-- From the workspace root run:
-```
+Bazel RBE with Buildbuddy
+=========================
+
+To install buildbuddy executor to a k8s cluster, run the following from the workspace root.
+
+```bash
+helm repo add buildbuddy https://helm.buildbuddy.io
+
 BB_EXECUTOR_API_KEY=<api_key> \
 IMAGE_TAG="$(grep DOCKER_IMAGE_TAG "docker.properties" | cut -d= -f2)" \
 envsubst < k8s/devinfra/buildbuddy-executor/values.yaml | \
-helm upgrade --install -f - buildbuddy buildbuddy/buildbuddy-executor --create-namespace -n buildbuddy
+helm upgrade --install -f - buildbuddy buildbuddy/buildbuddy-executor --create-namespace -n pixie-executors
 ```
diff --git a/k8s/devinfra/buildbuddy-executor/values.yaml b/k8s/devinfra/buildbuddy-executor/values.yaml
index b10c184d49f..c1c53d5b39a 100644
--- a/k8s/devinfra/buildbuddy-executor/values.yaml
+++ b/k8s/devinfra/buildbuddy-executor/values.yaml
@@ -1,5 +1,6 @@
 ---
-replicas: 48
+replicas: 32
+
 resources:
   limits:
     memory: 8Gi
@@ -10,7 +11,10 @@ config:
   executor:
     app_target: "grpcs://remote.buildbuddy.io:443"
     api_key: $BB_EXECUTOR_API_KEY
+    default_isolation_type: none
     docker_socket: ""
+    enable_podman: false
+    enable_oci: false
     enable_bare_runner: true
     local_cache_size_bytes: 375000000000  # 375GB
     millicpu: 4000
@@ -21,23 +25,23 @@ extraInitContainers:
   image: ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd
   # yamllint disable rule:line-length
   command: ['sh', '-c', 'set -e;
-    curl -fsSL https://github.com/buildbuddy-io/buildbuddy/releases/download/v2.12.42/executor-enterprise-linux-amd64 > /bb-executor/executor;
-    chmod +x /bb-executor/executor']
+    curl -fsSL https://github.com/buildbuddy-io/buildbuddy/releases/download/v2.154.0/executor-enterprise-linux-amd64 > /bb-executor/executor;
+    chmod +x /bb-executor/executor'
+  ]
   # yamllint enable rule:line-length
   volumeMounts:
   - name: bb-executor
     mountPath: /bb-executor
 
 image:
-  repository: gcr.io/pixie-oss/pixie-dev-public/dev_image
+  repository: ghcr.io/pixie-io/dev_image
   tag: '$IMAGE_TAG'
 
 # Some clusters don't have ipv6 enabled, but we need it for some tests.
 customExecutorCommand:
 - /bin/sh
 - -c
-- 'sysctl -w net.ipv6.conf.lo.disable_ipv6=0 &&
-   /bb-executor/executor --server_type=buildbuddy-executor'
+- 'sysctl -w net.ipv6.conf.lo.disable_ipv6=0 && /bb-executor/executor --server_type=buildbuddy-executor'
 
 poolName: '"$IMAGE_TAG"'