diff --git a/goma/k8s/rbe-dev/goma/deploy_auth-server.yaml b/goma/k8s/rbe-dev/goma/deploy_auth-server.yaml
index 0e08698..ade29d4 100644
--- a/goma/k8s/rbe-dev/goma/deploy_auth-server.yaml
+++ b/goma/k8s/rbe-dev/goma/deploy_auth-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: 20210312184541
+    buildtag: 20210419182855
     imagetag: latest
   labels:
     app: auth-server
@@ -31,7 +31,7 @@
         - --service-account-json-dir=/etc/goma/service-accounts
         - --remoteexec-addr=remotebuildexecution.googleapis.com:443
         - --remote-instance-name=projects/fuchsia-infra-goma-dev/instances/default_instance
-        image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:dca8354847cc4412194cddf21d3b7cdba1693514b8e5c3e676ba9c898c2f576a
+        image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:9348a499dab0b11bef2cccf3c093d2ba99372aceb64f51ff397a74951c20769a
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-dev/goma/deploy_exec-server.yaml b/goma/k8s/rbe-dev/goma/deploy_exec-server.yaml
index 14e9b15..e554aeb 100644
--- a/goma/k8s/rbe-dev/goma/deploy_exec-server.yaml
+++ b/goma/k8s/rbe-dev/goma/deploy_exec-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: 20210312184541
+    buildtag: 20210419182855
     imagetag: latest
   labels:
     app: exec-server
@@ -39,7 +39,7 @@
         envFrom:
         - configMapRef:
             name: memorystore
-        image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:763e271cac0ccd34fd4ede81577b5918caa724a1d9119347c0d1f91715c2ce8d
+        image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:1dce37ea99cc3e586feaef6933329db8b7b90de469696015b2fb23a584a17637
         livenessProbe:
           failureThreshold: 20
           httpGet:
diff --git a/goma/k8s/rbe-dev/goma/deploy_execlog-server.yaml b/goma/k8s/rbe-dev/goma/deploy_execlog-server.yaml
index 42d0f8f..66c6451 100644
--- a/goma/k8s/rbe-dev/goma/deploy_execlog-server.yaml
+++ b/goma/k8s/rbe-dev/goma/deploy_execlog-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: 20210312184541
+    buildtag: 20210419182855
     imagetag: latest
   labels:
     app: execlog-server
@@ -26,7 +26,7 @@
       - command:
         - /opt/goma/bin/execlog_server
         - --project-id=fuchsia-infra-goma-dev
-        image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:bea13f041650cd76e38e757cf567632dd2acd958c3546bc61b38538a9c1c55c9
+        image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:56f3951e7ae13fac9eb6942bb4ce9535e4f30302c7db7218c523f52c82c0f27b
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-dev/goma/deploy_file-server.yaml b/goma/k8s/rbe-dev/goma/deploy_file-server.yaml
index 1738537..fa61517 100644
--- a/goma/k8s/rbe-dev/goma/deploy_file-server.yaml
+++ b/goma/k8s/rbe-dev/goma/deploy_file-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: 20210312184541
+    buildtag: 20210419182855
     imagetag: latest
   labels:
     app: file-server
@@ -29,7 +29,7 @@
         - --redis-max-idle-conns=16
         - --redis-max-active-conns=32
         - --bucket=fuchsia-infra-goma-dev-rbe-dev-file-cache
-        image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:1a106da07c024c80799fb6c789ad15a4b773ff7e102a1690116f87e0d23984cb
+        image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:8a0f8d8b0884a9032c6abf80f65b3180fe461275d3b3ea417e16eb4f123c9bf0
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-dev/goma/deploy_frontend.yaml b/goma/k8s/rbe-dev/goma/deploy_frontend.yaml
index 3bae4c3..a848382 100644
--- a/goma/k8s/rbe-dev/goma/deploy_frontend.yaml
+++ b/goma/k8s/rbe-dev/goma/deploy_frontend.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: 20210312184541
+    buildtag: 20210419182855
     imagetag: latest
   labels:
     app: frontend
@@ -39,7 +39,7 @@
             >
         - --gport=5050
         - --port=80
-        image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:a96ea689349cdc6d5bf302d7ed8e3ca2ac4ff0c8fdde44a497d42258a4f2d4af
+        image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:6ef0d0717d60a536c7301bc2df4a8a6637555473cbd524ebe61685c41b52ad18
         livenessProbe:
           failureThreshold: 20
           httpGet:
diff --git a/goma/k8s/rbe-dev/goma/hpa_exec-server.yaml b/goma/k8s/rbe-dev/goma/hpa_exec-server.yaml
index 9aafa65..afd49eb 100644
--- a/goma/k8s/rbe-dev/goma/hpa_exec-server.yaml
+++ b/goma/k8s/rbe-dev/goma/hpa_exec-server.yaml
@@ -3,6 +3,13 @@
 metadata:
   name: exec-server
 spec:
+  behavior:
+    scaleUp:
+      policies:
+      - periodSeconds: 5
+        type: Pods
+        value: 10
+      stabilizationWindowSeconds: 300
   maxReplicas: 640
   metrics:
   - resource: