diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index d46ca09ce80..f381094beb0 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -16,7 +16,7 @@ RUN sudo apt-get update && \
     sudo apt-get -y install \
     wget software-properties-common make cmake python python-pip pkg-config \
     zlib1g-dev bash-completion bc libtool automake zip time g++-6 gcc-6 \
-    clang-5.0 rsync
+    clang-5.0 rsync ninja-build
 
 # ~100M, depends on g++, zlib1g-dev, bash-completions
 RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.11.0/bazel_0.11.0-linux-x86_64.deb && \
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6858a60c5e4..f4a44f11009 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,8 @@ jobs:
       - BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
     resource_class: xlarge
     steps:
-      - run: sudo apt-get update && sudo apt-get install -y pkg-config
+      - run: curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel_0.15.2-linux-x86_64.deb && sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb
+      - run: sudo apt-get update && sudo apt-get install -y ninja-build pkg-config
       - checkout
       - restore_cache:
           keys:
@@ -45,7 +46,7 @@ jobs:
       - BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
     steps:
       - run: sudo ntpdate -vu time.apple.com
-      - run: brew install automake bazel cmake coreutils go libtool wget
+      - run: brew install automake bazel cmake coreutils go libtool ninja wget
       - checkout
       - restore_cache:
           keys:
diff --git a/WORKSPACE b/WORKSPACE
index 4239cd00615..4969bac17e8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "1aa2430f3bf49557e20edf4f4ad8c2c1072e4b8f"
+ENVOY_SHA = "280baee6dc45e48a4bf38ac03d32711fe5eaeee1"
 
 http_archive(
     name = "envoy",
diff --git a/istio.deps b/istio.deps
index be03d3e9c9f..2b0cf9a282f 100644
--- a/istio.deps
+++ b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "1aa2430f3bf49557e20edf4f4ad8c2c1072e4b8f"
+		"lastStableSHA": "280baee6dc45e48a4bf38ac03d32711fe5eaeee1"
 	}
 ]
\ No newline at end of file