diff --git a/prow/cluster/jobs/all-periodics.yaml b/prow/cluster/jobs/all-periodics.yaml
index 02822b21b85..b3256a6f9c2 100644
--- a/prow/cluster/jobs/all-periodics.yaml
+++ b/prow/cluster/jobs/all-periodics.yaml
@@ -1,5 +1,5 @@
 istio_container_with_kind: &istio_container_with_kind
-  image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
   securityContext:
     privileged: true
   resources:
@@ -11,7 +11,7 @@ istio_container_with_kind: &istio_container_with_kind
       cpu: "3000m"
 
 istio_container_with_kind_mounts: &istio_container_with_kind_mounts
-  image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
   securityContext:
     privileged: true
   resources:
diff --git a/prow/cluster/jobs/istio-private/api/istio-private.api.master.gen.yaml b/prow/cluster/jobs/istio-private/api/istio-private.api.master.gen.yaml
index 7e8c9d78cb1..5b7b5716851 100644
--- a/prow/cluster/jobs/istio-private/api/istio-private.api.master.gen.yaml
+++ b/prow/cluster/jobs/istio-private/api/istio-private.api.master.gen.yaml
@@ -18,7 +18,7 @@ postsubmits:
       - command:
         - make
         - presubmit
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -57,7 +57,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -101,7 +101,7 @@ presubmits:
         env:
         - name: GCS_BUCKET
           value: istio-private-build/dev
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -143,7 +143,7 @@ presubmits:
         env:
         - name: GCS_BUCKET
           value: istio-private-build/dev
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml b/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml
index e893ca40bc5..d77d81b636c 100644
--- a/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml
+++ b/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -88,7 +88,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_default
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -143,7 +143,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_demo
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -198,7 +198,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_none
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -255,7 +255,7 @@ postsubmits:
         - --topology
         - MULTICLUSTER
         - doc.test.multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -312,7 +312,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -349,7 +349,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -387,7 +387,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_default
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -443,7 +443,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_demo
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -499,7 +499,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_none
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -557,7 +557,7 @@ presubmits:
         - --topology
         - MULTICLUSTER
         - doc.test.multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml b/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml
index 73f70521444..d269a7ee768 100644
--- a/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml
+++ b/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml
@@ -24,7 +24,7 @@ postsubmits:
           value: gcr.io/istio-prow-build
         - name: GCS_BUCKET
           value: istio-private-build/dev
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -76,7 +76,7 @@ postsubmits:
         - build
         - racetest
         - binaries-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -125,7 +125,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -195,7 +195,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -262,7 +262,7 @@ postsubmits:
           value: distroless
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -331,7 +331,7 @@ postsubmits:
           value: ipv6
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -396,7 +396,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -463,7 +463,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -533,7 +533,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -598,7 +598,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -665,7 +665,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -735,7 +735,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -800,7 +800,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -862,7 +862,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - test.integration.helm.kube
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -931,7 +931,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1002,7 +1002,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1071,7 +1071,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1140,7 +1140,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1209,7 +1209,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1278,7 +1278,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1345,7 +1345,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 --istio.test.istio.enableCNI=true '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1414,7 +1414,7 @@ presubmits:
         - build
         - racetest
         - binaries-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1459,7 +1459,7 @@ presubmits:
       - command:
         - entrypoint
         - prow/release-test.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1509,7 +1509,7 @@ presubmits:
         - entrypoint
         - make
         - benchtest
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1557,7 +1557,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1626,7 +1626,7 @@ presubmits:
           value: -postsubmit,-flaky,-multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.istio.enableCNI=true '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1692,7 +1692,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1758,7 +1758,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1826,7 +1826,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1898,7 +1898,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1966,7 +1966,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,+multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2034,7 +2034,7 @@ presubmits:
           value: distroless
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2104,7 +2104,7 @@ presubmits:
           value: ipv6
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2170,7 +2170,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2238,7 +2238,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2310,7 +2310,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2378,7 +2378,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2450,7 +2450,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2513,7 +2513,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - test.integration.helm.kube
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2575,7 +2575,7 @@ presubmits:
       - command:
         - make
         - test.integration.analyze
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2619,7 +2619,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2663,7 +2663,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2718,7 +2718,7 @@ presubmits:
       - command:
         - ../test-infra/tools/check_release_notes.sh
         - --token-path=/etc/github-token/oauth
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio-private/proxy/istio-private.proxy.master.gen.yaml b/prow/cluster/jobs/istio-private/proxy/istio-private.proxy.master.gen.yaml
index 91bfaed6ca8..eadae5ffc22 100644
--- a/prow/cluster/jobs/istio-private/proxy/istio-private.proxy.master.gen.yaml
+++ b/prow/cluster/jobs/istio-private/proxy/istio-private.proxy.master.gen.yaml
@@ -33,7 +33,7 @@ postsubmits:
           value: istio-private-artifacts
         - name: GCS_BUILD_BUCKET
           value: istio-private-build
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -90,7 +90,7 @@ postsubmits:
           value: istio-private-artifacts
         - name: GCS_BUILD_BUCKET
           value: istio-private-build
-        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -155,7 +155,7 @@ postsubmits:
           value: istio-private-artifacts
         - name: GCS_BUILD_BUCKET
           value: istio-private-build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -211,7 +211,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -259,7 +259,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -307,7 +307,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -355,7 +355,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -403,7 +403,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -452,7 +452,7 @@ presubmits:
           value: envoy
         - name: ENVOY_REPOSITORY
           value: https://github.com/envoyproxy/envoy
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio-private/release-builder/istio-private.release-builder.master.gen.yaml b/prow/cluster/jobs/istio-private/release-builder/istio-private.release-builder.master.gen.yaml
index e01e14b9a8e..46eba079d55 100644
--- a/prow/cluster/jobs/istio-private/release-builder/istio-private.release-builder.master.gen.yaml
+++ b/prow/cluster/jobs/istio-private/release-builder/istio-private.release-builder.master.gen.yaml
@@ -17,7 +17,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -55,7 +55,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -93,7 +93,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -140,7 +140,7 @@ postsubmits:
           value: istio-private-prerelease/prerelease
         - name: PRERELEASE_DOCKER_HUB
           value: gcr.io/istio-prow-build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -192,7 +192,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -231,7 +231,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -270,7 +270,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -313,7 +313,7 @@ presubmits:
           value: istio-private-prerelease/prerelease
         - name: PRERELEASE_DOCKER_HUB
           value: gcr.io/istio-prow-build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/api/istio.api.master.gen.yaml b/prow/cluster/jobs/istio/api/istio.api.master.gen.yaml
index 5a94e544ec7..4908fe0cdf1 100644
--- a/prow/cluster/jobs/istio/api/istio.api.master.gen.yaml
+++ b/prow/cluster/jobs/istio/api/istio.api.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - presubmit
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -99,7 +99,7 @@ postsubmits:
         - --modifier=update_api_dep
         - --token-path=/etc/github-token/oauth
         - --cmd=go get istio.io/api@$AUTOMATOR_SHA && go mod tidy && make clean gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -142,7 +142,7 @@ presubmits:
       - command:
         - make
         - presubmit
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -177,7 +177,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -222,7 +222,7 @@ presubmits:
       - command:
         - ../test-infra/tools/check_release_notes.sh
         - --token-path=/etc/github-token/oauth
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/bots/istio.bots.master.gen.yaml b/prow/cluster/jobs/istio/bots/istio.bots.master.gen.yaml
index 8a62ff1deb3..4b13a8c888e 100644
--- a/prow/cluster/jobs/istio/bots/istio.bots.master.gen.yaml
+++ b/prow/cluster/jobs/istio/bots/istio.bots.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -123,7 +123,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -201,7 +201,7 @@ postsubmits:
             secretKeyRef:
               key: githubOauthClientSecret
               name: policybot
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -242,7 +242,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -277,7 +277,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -312,7 +312,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -347,7 +347,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/client-go/istio.client-go.master.gen.yaml b/prow/cluster/jobs/istio/client-go/istio.client-go.master.gen.yaml
index 2c2bc711f3c..945375ef7b2 100644
--- a/prow/cluster/jobs/istio/client-go/istio.client-go.master.gen.yaml
+++ b/prow/cluster/jobs/istio/client-go/istio.client-go.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -137,7 +137,7 @@ postsubmits:
         - --git-exclude=common
         - --cmd=go get istio.io/client-go@$AUTOMATOR_SHA && go mod tidy && make clean
           gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -180,7 +180,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -215,7 +215,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -250,7 +250,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/common-files/istio.common-files.master.gen.yaml b/prow/cluster/jobs/istio/common-files/istio.common-files.master.gen.yaml
index 7f4f89a0321..2833c64f59f 100644
--- a/prow/cluster/jobs/istio/common-files/istio.common-files.master.gen.yaml
+++ b/prow/cluster/jobs/istio/common-files/istio.common-files.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -63,7 +63,7 @@ postsubmits:
         - --modifier=commonfiles
         - --token-path=/etc/github-token/oauth
         - --cmd=make update-common && make gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -117,7 +117,7 @@ postsubmits:
         - --modifier=commonfiles
         - --token-path=/etc/github-token/oauth
         - --cmd=make update-common && make gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -171,7 +171,7 @@ postsubmits:
         - --modifier=commonfiles
         - --token-path=/etc/github-token/oauth
         - --cmd=make update-common && make gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -229,7 +229,7 @@ postsubmits:
         - --
         - --post=make gen
         - --source=$AUTOMATOR_ROOT_DIR/files/common/scripts/setup_env.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -272,7 +272,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/community/istio.community.master.gen.yaml b/prow/cluster/jobs/istio/community/istio.community.master.gen.yaml
index 235132ae693..1821f2e6549 100644
--- a/prow/cluster/jobs/istio/community/istio.community.master.gen.yaml
+++ b/prow/cluster/jobs/istio/community/istio.community.master.gen.yaml
@@ -14,7 +14,7 @@ postsubmits:
       containers:
       - command:
         - prow/community-lint.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -50,7 +50,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -86,7 +86,7 @@ postsubmits:
       - command:
         - sh
         - prow/sync-org.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -128,7 +128,7 @@ presubmits:
       containers:
       - command:
         - prow/community-lint.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -163,7 +163,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/cri/istio.cri.master.gen.yaml b/prow/cluster/jobs/istio/cri/istio.cri.master.gen.yaml
index 2d257c3b79d..989087a4427 100644
--- a/prow/cluster/jobs/istio/cri/istio.cri.master.gen.yaml
+++ b/prow/cluster/jobs/istio/cri/istio.cri.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -123,7 +123,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -160,7 +160,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -195,7 +195,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -230,7 +230,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -265,7 +265,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/enhancements/istio.enhancements.master.gen.yaml b/prow/cluster/jobs/istio/enhancements/istio.enhancements.master.gen.yaml
index da832bac657..f8ca41d378f 100644
--- a/prow/cluster/jobs/istio/enhancements/istio.enhancements.master.gen.yaml
+++ b/prow/cluster/jobs/istio/enhancements/istio.enhancements.master.gen.yaml
@@ -25,7 +25,7 @@ presubmits:
         - ../test-infra/scripts/validate_schema.sh
         - --document-path=./features.yaml
         - --schema-path=./features_schema.json
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/envoy/istio.envoy.master.gen.yaml b/prow/cluster/jobs/istio/envoy/istio.envoy.master.gen.yaml
index e5d51a7f98d..87da0eef015 100644
--- a/prow/cluster/jobs/istio/envoy/istio.envoy.master.gen.yaml
+++ b/prow/cluster/jobs/istio/envoy/istio.envoy.master.gen.yaml
@@ -29,7 +29,7 @@ periodics:
       - --modifier=update_envoy_dep
       - --token-path=/etc/github-token/oauth
       - --cmd=scripts/update_envoy.sh $AUTOMATOR_SHA $AUTOMATOR_SHA_COMMIT_DATE
-      image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+      image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
       name: ""
       resources:
         limits:
diff --git a/prow/cluster/jobs/istio/gogo-genproto/istio.gogo-genproto.master.gen.yaml b/prow/cluster/jobs/istio/gogo-genproto/istio.gogo-genproto.master.gen.yaml
index 743bac206dd..3c57034cdae 100644
--- a/prow/cluster/jobs/istio/gogo-genproto/istio.gogo-genproto.master.gen.yaml
+++ b/prow/cluster/jobs/istio/gogo-genproto/istio.gogo-genproto.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -137,7 +137,7 @@ postsubmits:
         - --git-exclude=common
         - --cmd=go get istio.io/gogo_genproto@$AUTOMATOR_SHA && go mod tidy && make
           clean gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -180,7 +180,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -215,7 +215,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -250,7 +250,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml b/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml
index 81632c93387..5e06cf02bc9 100644
--- a/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml
+++ b/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml
@@ -27,7 +27,7 @@ periodics:
       - --modifier=refdocs
       - --token-path=/etc/github-token/oauth
       - --cmd=make update_ref_docs
-      image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+      image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
       name: ""
       resources:
         limits:
@@ -81,7 +81,7 @@ periodics:
       - --labels=release-notes-none
       - --token-path=/etc/github-token/oauth
       - --cmd=go get istio.io/istio@master && go mod tidy
-      image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+      image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
       name: ""
       resources:
         limits:
@@ -125,7 +125,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -161,7 +161,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -198,7 +198,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_default
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -253,7 +253,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_demo
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -308,7 +308,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_none
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -365,7 +365,7 @@ postsubmits:
         - --topology
         - MULTICLUSTER
         - doc.test.multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -420,7 +420,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -455,7 +455,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -491,7 +491,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_default
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -545,7 +545,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_demo
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -599,7 +599,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - doc.test.profile_none
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -655,7 +655,7 @@ presubmits:
         - --topology
         - MULTICLUSTER
         - doc.test.multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -718,7 +718,7 @@ presubmits:
         - --token-path=/etc/github-token/oauth
         - --cmd=make update_ref_docs
         - --dry-run
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml
index 0558a21b290..bbb8067f6da 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - build
         - racetest
         - binaries-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -60,7 +60,7 @@ postsubmits:
       - command:
         - entrypoint
         - prow/release-commit.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -106,7 +106,7 @@ postsubmits:
         - make
         - benchtest
         - report-benchtest
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -150,7 +150,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -215,7 +215,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -277,7 +277,7 @@ postsubmits:
           value: distroless
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -341,7 +341,7 @@ postsubmits:
           value: ipv6
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -401,7 +401,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -463,7 +463,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -528,7 +528,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -588,7 +588,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -650,7 +650,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -715,7 +715,7 @@ postsubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -775,7 +775,7 @@ postsubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -832,7 +832,7 @@ postsubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - test.integration.helm.kube
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -896,7 +896,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -962,7 +962,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1026,7 +1026,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1090,7 +1090,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1154,7 +1154,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1218,7 +1218,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1280,7 +1280,7 @@ postsubmits:
         env:
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.retries=1 --istio.test.istio.enableCNI=true '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1342,7 +1342,7 @@ presubmits:
         - build
         - racetest
         - binaries-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1381,7 +1381,7 @@ presubmits:
       - command:
         - entrypoint
         - prow/release-test.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1424,7 +1424,7 @@ presubmits:
         - entrypoint
         - make
         - benchtest
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1465,7 +1465,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1527,7 +1527,7 @@ presubmits:
           value: -postsubmit,-flaky,-multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: ' --istio.test.istio.enableCNI=true '
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1586,7 +1586,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1645,7 +1645,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1706,7 +1706,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1771,7 +1771,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1832,7 +1832,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,+multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1893,7 +1893,7 @@ presubmits:
           value: distroless
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -1956,7 +1956,7 @@ presubmits:
           value: ipv6
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2015,7 +2015,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -postsubmit,-flaky,-multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2076,7 +2076,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2141,7 +2141,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2202,7 +2202,7 @@ presubmits:
         env:
         - name: TEST_SELECT
           value: -multicluster
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2267,7 +2267,7 @@ presubmits:
           value: -multicluster
         - name: INTEGRATION_TEST_FLAGS
           value: --istio.test.istio.istiodlessRemotes
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2323,7 +2323,7 @@ presubmits:
         - entrypoint
         - prow/integ-suite-kind.sh
         - test.integration.helm.kube
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2378,7 +2378,7 @@ presubmits:
       - command:
         - make
         - test.integration.analyze
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2415,7 +2415,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2452,7 +2452,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -2498,7 +2498,7 @@ presubmits:
       - command:
         - ../test-infra/tools/check_release_notes.sh
         - --token-path=/etc/github-token/oauth
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/pkg/istio.pkg.master.gen.yaml b/prow/cluster/jobs/istio/pkg/istio.pkg.master.gen.yaml
index 6f0e21ecef0..b2bbb8ad168 100644
--- a/prow/cluster/jobs/istio/pkg/istio.pkg.master.gen.yaml
+++ b/prow/cluster/jobs/istio/pkg/istio.pkg.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -123,7 +123,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -172,7 +172,7 @@ postsubmits:
         - --token-path=/etc/github-token/oauth
         - --git-exclude=common
         - --cmd=go get istio.io/pkg@$AUTOMATOR_SHA && go mod tidy && make clean gen
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -215,7 +215,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -250,7 +250,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -285,7 +285,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -320,7 +320,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/proxy/istio.proxy.master.gen.yaml b/prow/cluster/jobs/istio/proxy/istio.proxy.master.gen.yaml
index 6dbd81c7712..c974a26d19c 100644
--- a/prow/cluster/jobs/istio/proxy/istio.proxy.master.gen.yaml
+++ b/prow/cluster/jobs/istio/proxy/istio.proxy.master.gen.yaml
@@ -19,7 +19,7 @@ postsubmits:
       - command:
         - entrypoint
         - ./prow/proxy-postsubmit.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -62,7 +62,7 @@ postsubmits:
       containers:
       - command:
         - ./prow/proxy-postsubmit-centos.sh
-        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -111,7 +111,7 @@ postsubmits:
         - --modifier=update_proxy_dep
         - --token-path=/etc/github-token/oauth
         - --cmd=bin/update_proxy.sh $AUTOMATOR_SHA
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -157,7 +157,7 @@ presubmits:
       containers:
       - command:
         - ./prow/proxy-presubmit.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -195,7 +195,7 @@ presubmits:
       containers:
       - command:
         - ./prow/proxy-presubmit-asan.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -233,7 +233,7 @@ presubmits:
       containers:
       - command:
         - ./prow/proxy-presubmit-tsan.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -271,7 +271,7 @@ presubmits:
       containers:
       - command:
         - ./prow/proxy-presubmit-release.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -309,7 +309,7 @@ presubmits:
       containers:
       - command:
         - ./prow/proxy-presubmit-centos-release.sh
-        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -348,7 +348,7 @@ presubmits:
       - command:
         - entrypoint
         - ./prow/proxy-presubmit-wasm.sh
-        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/release-builder/istio.release-builder.master.gen.yaml b/prow/cluster/jobs/istio/release-builder/istio.release-builder.master.gen.yaml
index 4c29699ecf9..2dbdd9b6950 100644
--- a/prow/cluster/jobs/istio/release-builder/istio.release-builder.master.gen.yaml
+++ b/prow/cluster/jobs/istio/release-builder/istio.release-builder.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -126,7 +126,7 @@ postsubmits:
       - command:
         - entrypoint
         - test/publish.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -169,7 +169,7 @@ postsubmits:
       - command:
         - entrypoint
         - release/build.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -219,7 +219,7 @@ postsubmits:
       - command:
         - entrypoint
         - release/publish.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -260,7 +260,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -295,7 +295,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -330,7 +330,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -368,7 +368,7 @@ presubmits:
       - command:
         - entrypoint
         - test/publish.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -408,7 +408,7 @@ presubmits:
       containers:
       - command:
         - release/build-warning.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -444,7 +444,7 @@ presubmits:
       containers:
       - command:
         - release/publish-warning.sh
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml b/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml
index bda2c95ac75..54b81efaa65 100644
--- a/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml
+++ b/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.gen.yaml
@@ -29,7 +29,7 @@ periodics:
       - --image=gcr.io/k8s-prow/.*
       - --tag=v[0-9]{8}-[a-f0-9]{10}
       - --var=image
-      image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+      image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
       name: ""
       resources:
         limits:
@@ -73,7 +73,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -109,7 +109,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -145,7 +145,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -204,7 +204,7 @@ postsubmits:
         - deploy-monitoring
         - deploy-build
         - deploy-private
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -247,7 +247,7 @@ postsubmits:
         - -C
         - boskos
         - deploy
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -290,7 +290,7 @@ postsubmits:
         - -C
         - boskos
         - boskos-config
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -333,7 +333,7 @@ postsubmits:
         - -C
         - boskos
         - mason-image
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -382,7 +382,7 @@ postsubmits:
         - docker/prowbazel
         - image
         - push-safe
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -430,7 +430,7 @@ postsubmits:
         - -C
         - authentikos
         - deploy
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -478,7 +478,7 @@ postsubmits:
         - -C
         - prow/genjobs
         - deploy
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -519,7 +519,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -554,7 +554,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -589,7 +589,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -627,7 +627,7 @@ presubmits:
         - -C
         - authentikos
         - unit-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -668,7 +668,7 @@ presubmits:
         - -C
         - authentikos
         - integ-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/cluster/jobs/istio/tools/istio.tools.master.gen.yaml b/prow/cluster/jobs/istio/tools/istio.tools.master.gen.yaml
index 71bf9ccd29a..f2410ebb12f 100644
--- a/prow/cluster/jobs/istio/tools/istio.tools.master.gen.yaml
+++ b/prow/cluster/jobs/istio/tools/istio.tools.master.gen.yaml
@@ -15,7 +15,7 @@ postsubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -51,7 +51,7 @@ postsubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -87,7 +87,7 @@ postsubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -123,7 +123,7 @@ postsubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -163,7 +163,7 @@ postsubmits:
         - entrypoint
         - make
         - containers
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -209,7 +209,7 @@ postsubmits:
         - -C
         - perf_dashboard
         - deploy
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -250,7 +250,7 @@ presubmits:
       - command:
         - make
         - build
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -285,7 +285,7 @@ presubmits:
       - command:
         - make
         - lint
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -320,7 +320,7 @@ presubmits:
       - command:
         - make
         - test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -355,7 +355,7 @@ presubmits:
       - command:
         - make
         - gen-check
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -397,7 +397,7 @@ presubmits:
         env:
         - name: TRIALRUN
           value: "True"
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
@@ -436,7 +436,7 @@ presubmits:
         - entrypoint
         - make
         - containers-test
-        image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+        image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
         name: ""
         resources:
           limits:
diff --git a/prow/config/jobs/api.yaml b/prow/config/jobs/api.yaml
index b20fa067d3d..69e2518f6af 100644
--- a/prow/config/jobs/api.yaml
+++ b/prow/config/jobs/api.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: api
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/bots.yaml b/prow/config/jobs/bots.yaml
index 933e04cf04d..7257a816af2 100644
--- a/prow/config/jobs/bots.yaml
+++ b/prow/config/jobs/bots.yaml
@@ -1,6 +1,6 @@
 org: istio
 repo: bots
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/client-go.yaml b/prow/config/jobs/client-go.yaml
index 54633aac406..c583f06b24e 100644
--- a/prow/config/jobs/client-go.yaml
+++ b/prow/config/jobs/client-go.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: client-go
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/common-files.yaml b/prow/config/jobs/common-files.yaml
index bf9491e9448..550be9089bf 100644
--- a/prow/config/jobs/common-files.yaml
+++ b/prow/config/jobs/common-files.yaml
@@ -1,7 +1,7 @@
 org: istio
 support_release_branching: true
 repo: common-files
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: lint
diff --git a/prow/config/jobs/community.yaml b/prow/config/jobs/community.yaml
index 1a4c57ff94f..ec9741725c6 100644
--- a/prow/config/jobs/community.yaml
+++ b/prow/config/jobs/community.yaml
@@ -1,6 +1,6 @@
 org: istio
 repo: community
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: lint
diff --git a/prow/config/jobs/cri.yaml b/prow/config/jobs/cri.yaml
index 6a8ddbd39d5..e3223e4e356 100644
--- a/prow/config/jobs/cri.yaml
+++ b/prow/config/jobs/cri.yaml
@@ -1,6 +1,6 @@
 org: istio
 repo: cri
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/enhancements.yaml b/prow/config/jobs/enhancements.yaml
index d660953b5b9..b8b7c8b4de2 100644
--- a/prow/config/jobs/enhancements.yaml
+++ b/prow/config/jobs/enhancements.yaml
@@ -2,7 +2,7 @@ org: istio
 repo: enhancements
 branches: [master]
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 jobs:
 - name: validate-features
   types: [presubmit]
diff --git a/prow/config/jobs/envoy.yaml b/prow/config/jobs/envoy.yaml
index c7625777415..d08135634a7 100644
--- a/prow/config/jobs/envoy.yaml
+++ b/prow/config/jobs/envoy.yaml
@@ -52,7 +52,7 @@ jobs:
   - --cmd=scripts/update_envoy.sh $AUTOMATOR_SHA $AUTOMATOR_SHA_COMMIT_DATE
   requirements: [github]
   repos: [istio/test-infra@master]
-  image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
   timeout: 4h
 
 resources:
diff --git a/prow/config/jobs/gogo-genproto.yaml b/prow/config/jobs/gogo-genproto.yaml
index ef00756cb6d..894261c5ca5 100644
--- a/prow/config/jobs/gogo-genproto.yaml
+++ b/prow/config/jobs/gogo-genproto.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: gogo-genproto
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/istio.io.yaml b/prow/config/jobs/istio.io.yaml
index 847028b7f09..3abf1816aea 100644
--- a/prow/config/jobs/istio.io.yaml
+++ b/prow/config/jobs/istio.io.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: istio.io
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: lint
diff --git a/prow/config/jobs/istio.yaml b/prow/config/jobs/istio.yaml
index 56250dde187..0115a16ca0a 100644
--- a/prow/config/jobs/istio.yaml
+++ b/prow/config/jobs/istio.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: istio
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 jobs:
   - name: unit-tests
     command: [entrypoint, make, -e, "T=-v -count=1", build, racetest, binaries-test]
diff --git a/prow/config/jobs/pkg.yaml b/prow/config/jobs/pkg.yaml
index 26eda07bdab..72529b57812 100644
--- a/prow/config/jobs/pkg.yaml
+++ b/prow/config/jobs/pkg.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: pkg
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build
diff --git a/prow/config/jobs/proxy.yaml b/prow/config/jobs/proxy.yaml
index d7e00fa27ca..7c00ba3c893 100644
--- a/prow/config/jobs/proxy.yaml
+++ b/prow/config/jobs/proxy.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: proxy
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools-proxy:master-2021-06-15T16-37-30
 node_selector:
   testing: build-pool
 
@@ -34,7 +34,7 @@ jobs:
   types: [presubmit]
   command: [./prow/proxy-presubmit-centos-release.sh]
   requirements: [gcp]
-  image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
   timeout: 4h
 
 - name: check-wasm
@@ -53,7 +53,7 @@ jobs:
   types: [postsubmit]
   command: [./prow/proxy-postsubmit-centos.sh]
   requirements: [gcp]
-  image: gcr.io/istio-testing/build-tools-centos:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools-centos:master-2021-06-15T16-37-30
   timeout: 4h
 
 - name: update-istio
@@ -69,7 +69,7 @@ jobs:
   - --cmd=bin/update_proxy.sh $AUTOMATOR_SHA
   requirements: [github]
   repos: [istio/test-infra@master]
-  image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+  image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
   timeout: 4h
 
 resources:
diff --git a/prow/config/jobs/release-builder.yaml b/prow/config/jobs/release-builder.yaml
index 4bbd0016fa2..1d9626366eb 100644
--- a/prow/config/jobs/release-builder.yaml
+++ b/prow/config/jobs/release-builder.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: release-builder
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: lint
diff --git a/prow/config/jobs/test-infra.yaml b/prow/config/jobs/test-infra.yaml
index ccb6670de98..9e81c377994 100644
--- a/prow/config/jobs/test-infra.yaml
+++ b/prow/config/jobs/test-infra.yaml
@@ -1,6 +1,6 @@
 org: istio
 repo: test-infra
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: lint
diff --git a/prow/config/jobs/tools.yaml b/prow/config/jobs/tools.yaml
index 66db5c47c42..f3af48d9a46 100644
--- a/prow/config/jobs/tools.yaml
+++ b/prow/config/jobs/tools.yaml
@@ -1,7 +1,7 @@
 org: istio
 repo: tools
 support_release_branching: true
-image: gcr.io/istio-testing/build-tools:master-2021-06-07T22-22-51
+image: gcr.io/istio-testing/build-tools:master-2021-06-15T16-37-30
 
 jobs:
   - name: build