diff --git a/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
index 5f2c55f..58fab41 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: "20210420141048"
+    buildtag: "20210702_170646"
     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-prod/instances/default_instance
-        image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:9348a499dab0b11bef2cccf3c093d2ba99372aceb64f51ff397a74951c20769a
+        image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:ce01d48520d041bdd9c78b8543f961d3d4df4ba4e38086089693826e2b038524
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
index a4283f9..c371b65 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: "20210420141048"
+    buildtag: "20210702_170646"
     imagetag: latest
   labels:
     app: exec-server
@@ -39,7 +39,7 @@
         envFrom:
         - configMapRef:
             name: memorystore
-        image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:1dce37ea99cc3e586feaef6933329db8b7b90de469696015b2fb23a584a17637
+        image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:4ac412a7856cf1d41e04f55324f87a41eaca783dbc176c9ec17bb8d3a1cae649
         livenessProbe:
           failureThreshold: 20
           httpGet:
diff --git a/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
index 3a08597..e24be52 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: "20210420141048"
+    buildtag: "20210702_170646"
     imagetag: latest
   labels:
     app: execlog-server
@@ -26,7 +26,7 @@
       - command:
         - /opt/goma/bin/execlog_server
         - --project-id=fuchsia-infra-goma-prod
-        image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:56f3951e7ae13fac9eb6942bb4ce9535e4f30302c7db7218c523f52c82c0f27b
+        image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:75acee85cd71a3a30c3b9f016aa17472146ac3a54eececb2da60f1afe96c5a7b
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
index 2f51a5b..4328310 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: "20210420141048"
+    buildtag: "20210702_170646"
     imagetag: latest
   labels:
     app: file-server
@@ -29,7 +29,7 @@
         - --redis-max-idle-conns=16
         - --redis-max-active-conns=32
         - --bucket=fuchsia-infra-goma-prod-rbe-prod1-file-cache
-        image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:8a0f8d8b0884a9032c6abf80f65b3180fe461275d3b3ea417e16eb4f123c9bf0
+        image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:03c36f1af3ecd0b5d4a9f2c5c544bdb3d8e36e72a8c7ef17877c1fe99abdcfc3
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml b/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
index 06c6039..a0e8d34 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
@@ -2,7 +2,7 @@
 kind: Deployment
 metadata:
   annotations:
-    buildtag: "20210420141048"
+    buildtag: "20210702_170646"
     imagetag: latest
   labels:
     app: frontend
@@ -39,7 +39,7 @@
             >
         - --gport=5050
         - --port=80
-        image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:6ef0d0717d60a536c7301bc2df4a8a6637555473cbd524ebe61685c41b52ad18
+        image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:240ee6ba6b509a724a5295ec1da36a3fee26cb461d1c461217ffa6380819fcd9
         livenessProbe:
           failureThreshold: 20
           httpGet: