diff --git a/docker/istio_builders/CHANGELOG.md b/docker/istio_builders/CHANGELOG.md
index 4d09f190df8..65433c1af46 100644
--- a/docker/istio_builders/CHANGELOG.md
+++ b/docker/istio_builders/CHANGELOG.md
@@ -4,3 +4,4 @@
 * 0.5.4: update golang to 1.10.1
 * 0.5.5: adds helm 2.7.2
 * 0.5.6: adds ninja and updates bazel to 0.15.2
+* 0.5.7: update clang to 6.0
diff --git a/docker/istio_builders/Makefile b/docker/istio_builders/Makefile
index aa39d7a57be..be1fe84267f 100644
--- a/docker/istio_builders/Makefile
+++ b/docker/istio_builders/Makefile
@@ -1,5 +1,5 @@
 PROJECT = istio-testing
-VERSION = 0.5.6
+VERSION = 0.5.7
 
 # Note: The build directory is the root of the istio/test-infra repository, not ./
 image:
diff --git a/docker/prowbazel/Makefile b/docker/prowbazel/Makefile
index cbe333af4e1..c4fc2d54902 100644
--- a/docker/prowbazel/Makefile
+++ b/docker/prowbazel/Makefile
@@ -1,5 +1,5 @@
 PROJECT = istio-testing
-VERSION = 0.4.10
+VERSION = 0.4.11
 
 # Note: The build directory is the root of the istio/test-infra repository, not ./
 image:
diff --git a/docker/prowbazel/README.md b/docker/prowbazel/README.md
index 7f1b8fa76a5..d92ab06fa30 100644
--- a/docker/prowbazel/README.md
+++ b/docker/prowbazel/README.md
@@ -41,3 +41,4 @@ Our dependency on this script is because it appropariately writes test job resul
 * 0.4.8: update golang to 1.10.1
 * 0.4.9: adds helm 2.7.2
 * 0.4.10: adds ninja and updates bazel to 0.15.2
+* 0.4.11: update clang to 6.0
diff --git a/prow/README.md b/prow/README.md
index 69aa7157492..9b1d69f935d 100644
--- a/prow/README.md
+++ b/prow/README.md
@@ -129,7 +129,7 @@ presubmits:
     - master
     spec:
       containers:
-      - image: gcr.io/istio-testing/prowbazel:0.1.2
+      - image: gcr.io/istio-testing/prowbazel:0.4.11
     # ...
 
 # in plugins.yaml
diff --git a/prow/cluster/jobs/all-periodics.yaml b/prow/cluster/jobs/all-periodics.yaml
index a8c4663818a..e802252e6f4 100644
--- a/prow/cluster/jobs/all-periodics.yaml
+++ b/prow/cluster/jobs/all-periodics.yaml
@@ -9,7 +9,7 @@ periodics:
     preset-istio-kubeconfig: "true"
   spec:
     containers:
-    - image: gcr.io/istio-testing/prowbazel:0.4.9
+    - image: gcr.io/istio-testing/prowbazel:0.4.11
       args:
       - "--repo=github.com/istio/test-infra=master"
       - "--clean"
@@ -28,7 +28,7 @@ periodics:
     preset-daily-kubeconfig: "true"
   spec:
     containers:
-    - image: gcr.io/istio-testing/prowbazel:0.4.9
+    - image: gcr.io/istio-testing/prowbazel:0.4.11
       args:
       - "--repo=github.com/istio/test-infra=master"
       - "--clean"
@@ -46,7 +46,7 @@ periodics:
     preset-service-account: "true"
   spec:
     containers:
-    - image: gcr.io/istio-testing/prowbazel:0.4.9
+    - image: gcr.io/istio-testing/prowbazel:0.4.11
       args:
       - "--repo=github.com/istio/test-infra=master"
       - "--clean"
@@ -64,7 +64,7 @@ periodics:
     preset-service-account: "true"
   spec:
     containers:
-    - image: gcr.io/istio-testing/prowbazel:0.4.9
+    - image: gcr.io/istio-testing/prowbazel:0.4.11
       args:
       - "--repo=github.com/istio/test-infra=master"
       - "--clean"
@@ -103,7 +103,7 @@ periodics:
       - --repo=green-build
       - --clean
       - --timeout=120
-      image: gcr.io/istio-testing/prow-builder:0.5.5
+      image: gcr.io/istio-testing/prow-builder:0.5.7
       securityContext:
         privileged: true
       env:
@@ -137,7 +137,7 @@ periodics:
     preset-service-account: "true"
   spec:
     containers:
-    - image: gcr.io/istio-testing/prowbazel:0.4.9
+    - image: gcr.io/istio-testing/prowbazel:0.4.11
       args:
       - "--repo=github.com/istio/test-infra=master"
       - "--clean"
diff --git a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.master.yaml b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.master.yaml
index d7498649cf2..541fe500ba8 100644
--- a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.master.yaml
+++ b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.master.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-0.8.yaml b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-0.8.yaml
index 9a5aae86cef..d1a54cd03b8 100644
--- a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-0.8.yaml
+++ b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-0.8.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-1.0.yaml b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-1.0.yaml
index d505418c8c2..a974419ddad 100644
--- a/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-1.0.yaml
+++ b/prow/cluster/jobs/istio-releases/daily-release/istio-releases.daily-release.release-1.0.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/api/istio.api.master.yaml b/prow/cluster/jobs/istio/api/istio.api.master.yaml
index 9b89b181f91..dcf6f36a37a 100644
--- a/prow/cluster/jobs/istio/api/istio.api.master.yaml
+++ b/prow/cluster/jobs/istio/api/istio.api.master.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/api/istio.api.release-0.8.yaml b/prow/cluster/jobs/istio/api/istio.api.release-0.8.yaml
index 34088fb256f..dadebbf0c27 100644
--- a/prow/cluster/jobs/istio/api/istio.api.release-0.8.yaml
+++ b/prow/cluster/jobs/istio/api/istio.api.release-0.8.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.collab-gcp-identity.yaml b/prow/cluster/jobs/istio/istio/istio.istio.collab-gcp-identity.yaml
index e90b41228c2..3a4019a02ee 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.collab-gcp-identity.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.collab-gcp-identity.yaml
@@ -1,7 +1,7 @@
 
 common_spec: &common_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.master.yaml b/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
index 5d553c70a34..d72da54203c 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
@@ -1,7 +1,7 @@
 
 common_spec: &common_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.release-0.8.yaml b/prow/cluster/jobs/istio/istio/istio.istio.release-0.8.yaml
index b1cda95db56..86f974ccf76 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.release-0.8.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.release-0.8.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
@@ -33,7 +33,7 @@ presubmits:
       preset-istio-kubeconfig: "true"
     spec:
       containers:
-      - image: gcr.io/istio-testing/prowbazel:0.4.9
+      - image: gcr.io/istio-testing/prowbazel:0.4.11
         args:
         - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
         - "--clean"
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.release-1.0.yaml b/prow/cluster/jobs/istio/istio/istio.istio.release-1.0.yaml
index ae4d1065a90..deccb05e521 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.release-1.0.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.release-1.0.yaml
@@ -1,7 +1,7 @@
 
 common_e2e_spec: &common_e2e_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
@@ -33,7 +33,7 @@ presubmits:
       preset-istio-kubeconfig: "true"
     spec:
       containers:
-      - image: gcr.io/istio-testing/prowbazel:0.4.9
+      - image: gcr.io/istio-testing/prowbazel:0.4.11
         args:
         - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
         - "--clean"
diff --git a/prow/cluster/jobs/istio/proxy/istio.proxy.master.yaml b/prow/cluster/jobs/istio/proxy/istio.proxy.master.yaml
index 48a2edf8ac9..0f5a37887c1 100644
--- a/prow/cluster/jobs/istio/proxy/istio.proxy.master.yaml
+++ b/prow/cluster/jobs/istio/proxy/istio.proxy.master.yaml
@@ -1,7 +1,7 @@
 
 bazel_spec: &bazel_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.10
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/proxy/istio.proxy.release-1.0.yaml b/prow/cluster/jobs/istio/proxy/istio.proxy.release-1.0.yaml
index 26f996044b4..33bc4abb507 100644
--- a/prow/cluster/jobs/istio/proxy/istio.proxy.release-1.0.yaml
+++ b/prow/cluster/jobs/istio/proxy/istio.proxy.release-1.0.yaml
@@ -1,7 +1,7 @@
 
 bazel_spec: &bazel_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.10
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/proxy/istio.proxy.sds_api.yaml b/prow/cluster/jobs/istio/proxy/istio.proxy.sds_api.yaml
index 30f8559adbb..2deba13c31b 100644
--- a/prow/cluster/jobs/istio/proxy/istio.proxy.sds_api.yaml
+++ b/prow/cluster/jobs/istio/proxy/istio.proxy.sds_api.yaml
@@ -1,7 +1,7 @@
 
 bazel_spec: &bazel_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.9
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.yaml b/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.yaml
index 8134c472c56..96e9f14270a 100644
--- a/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.yaml
+++ b/prow/cluster/jobs/istio/test-infra/istio.test-infra.master.yaml
@@ -1,7 +1,7 @@
 
 bazel_spec: &bazel_spec
   containers:
-  - image: gcr.io/istio-testing/prowbazel:0.4.10
+  - image: gcr.io/istio-testing/prowbazel:0.4.11
     args:
     - "--repo=github.com/$(REPO_OWNER)/$(REPO_NAME)=$(PULL_REFS)"
     - "--clean"
diff --git a/scripts/tools/linux-install-clang b/scripts/tools/linux-install-clang
index 33a4b20fca2..ca08ed76e0c 100755
--- a/scripts/tools/linux-install-clang
+++ b/scripts/tools/linux-install-clang
@@ -9,29 +9,29 @@ fi
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 . ${DIR}/all-utilities || { echo "Cannot load Bash utilities" ; exit 1 ; }
 
-LLVM_VERSION=5.0
+LLVM_VERSION=6.0
 
 # Ubuntu 16-04
-REPO='xenial'
+LLVM_REPO='xenial'
 
 function install_clang() {
   echo 'Installing clang'
   curl https://apt.llvm.org/llvm-snapshot.gpg.key | ${SUDO} apt-key add - \
   && clear_apt \
-  && ${SUDO} apt-get -qqy install "clang-${LLVM_VERSION}" \
+  && ${SUDO} apt-get -qqy install "clang-${LLVM_VERSION}" "clang-format-${LLVM_VERSION}" \
   && return 0
   return 1
 }
 
 function update_llvm_apt() {
   echo 'Adding repo for llvm'
-  echo "deb http://apt.llvm.org/xenial/${REPO} llvm-toolchain-${REPO}-${LLVM_VERSION} main" \
+  echo "deb http://apt.llvm.org/${LLVM_REPO}/ llvm-toolchain-${LLVM_REPO}-${LLVM_VERSION} main" \
     | ${SUDO} tee /etc/apt/sources.list.d/llvm.list
 }
 
 function update_clang() {
   if [[ ! -x "$(command -v clang-${LLVM_VERSION})" ]]; then
-    update_llvm
+    update_llvm_apt
     retry install_clang || error_exit 'Cannot install clang.'
   fi
   echo 'clang is up to date.'