diff --git a/Makefile.core.mk b/Makefile.core.mk
index 73cb7f930e9..c8c79f35223 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -79,11 +79,11 @@ build_envoy_asan:
 # Implicitly depends on build, but does not require a specific configuration
 .PHONY: wasm_include
 wasm_include:
-	cp -f $$(bazel info bazel-bin)/extensions/common/node_info_generated.h $(TOP)/extensions/common/
-	cp -f $$(bazel info bazel-bin)/extensions/common/node_info_bfbs_generated.h $(TOP)/extensions/common/
-	cp -f $$(bazel info bazel-bin)/extensions/common/nlohmann_json.hpp $(TOP)/extensions/common/
-	cp -fLR $$(bazel info bazel-bin)/external/com_github_google_flatbuffers/_virtual_includes/runtime_cc/flatbuffers $(TOP)/extensions/common/
-	cp -f $$(bazel info output_base)/external/envoy/api/wasm/cpp/contrib/proxy_expr.h $(TOP)/extensions/common/
+	cp -f $$(bazel info bazel-bin $(BAZEL_BUILD_ARGS))/extensions/common/node_info_generated.h $(TOP)/extensions/common/
+	cp -f $$(bazel info bazel-bin $(BAZEL_BUILD_ARGS))/extensions/common/node_info_bfbs_generated.h $(TOP)/extensions/common/
+	cp -f $$(bazel info bazel-bin $(BAZEL_BUILD_ARGS))/extensions/common/nlohmann_json.hpp $(TOP)/extensions/common/
+	cp -fLR $$(bazel info bazel-bin $(BAZEL_BUILD_ARGS))/external/com_github_google_flatbuffers/_virtual_includes/runtime_cc/flatbuffers $(TOP)/extensions/common/
+	cp -f $$(bazel info output_base $(BAZEL_BUILD_ARGS))/external/envoy/api/wasm/cpp/contrib/proxy_expr.h $(TOP)/extensions/common/
 
 build_wasm: wasm_include
 	$(foreach file, $(shell find extensions -name build_wasm.sh), cd $(TOP)/$(shell dirname $(file)) && bash ./build_wasm.sh &&) true
diff --git a/WORKSPACE b/WORKSPACE
index 79f128c70f5..ea1755a5426 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -37,11 +37,12 @@ bind(
 # 1. Determine SHA256 `wget https://github.com/istio/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# Commit time: 4/24/20
+# commit date: 06/08/2020
 # Used by scripts/generate-wasm.sh
-ENVOY_SHA = "ebac37fb1aa7380863302677b753b5489c833523"
 
-ENVOY_SHA256 = "3b085fdd617d48d192cb3b756625f878a9a42df8f643e9efd6933a94a503894c"
+ENVOY_SHA = "71de2b016f078b5edaa7526970628ea645cd638c"
+
+ENVOY_SHA256 = "39c0f444193ad15f6c54d70a83dfd1336b44f59d4c923121d280b187211faed9"
 
 ENVOY_ORG = "istio"