diff --git a/WORKSPACE b/WORKSPACE
index 3300c02de12..0370f18d589 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,10 +38,10 @@ bind(
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
 # Note: this is needed by release builder to resolve envoy dep sha to tag.
-# Commit date: 2022-04-13
-ENVOY_SHA = "03efacf2f9bc10bf92c61491274c4ba9ff0ad1bd"
+# Commit date: 2022-04-15
+ENVOY_SHA = "12e740d76f330242142a8940d33e7cf41584e35c"
 
-ENVOY_SHA256 = "4cd1a1b44dd0f16dde993b0209d38298eb860654fabf8a38aff4e74c6ba2af62"
+ENVOY_SHA256 = "935316c27bbf4e04374bb5fb8e44827b9bcdbc9cc73179a9f62cebeb754fa0cd"
 
 ENVOY_ORG = "envoyproxy"
 
diff --git a/bazel/platform_mappings b/bazel/platform_mappings
new file mode 100644
index 00000000000..b3d228f9add
--- /dev/null
+++ b/bazel/platform_mappings
@@ -0,0 +1,36 @@
+flags:
+  --cpu=arm64-v8a
+  --crosstool_top=//external:android/crosstool
+    @envoy//bazel:android_aarch64
+
+  --cpu=armeabi-v7a
+  --crosstool_top=//external:android/crosstool
+    @envoy//bazel:android_armeabi
+
+  --cpu=x86
+  --crosstool_top=//external:android/crosstool
+    @envoy//bazel:android_x86
+
+  --cpu=x86_64
+  --crosstool_top=//external:android/crosstool
+    @envoy//bazel:android_x86_64
+
+  --cpu=darwin_x86_64
+  --apple_platform_type=macos
+    @envoy//bazel:macos_x86_64
+
+  --cpu=darwin_arm64
+  --apple_platform_type=macos
+    @envoy//bazel:macos_arm64
+
+  --cpu=ios_x86_64
+  --apple_platform_type=ios
+    @envoy//bazel:ios_x86_64_platform
+
+  --cpu=ios_sim_arm64
+  --apple_platform_type=ios
+    @envoy//bazel:ios_sim_arm64
+
+  --cpu=ios_arm64
+  --apple_platform_type=ios
+    @envoy//bazel:ios_arm64_platform
\ No newline at end of file
diff --git a/envoy.bazelrc b/envoy.bazelrc
index 33928b89c7c..5f8123c7b34 100644
--- a/envoy.bazelrc
+++ b/envoy.bazelrc
@@ -18,6 +18,7 @@ build --incompatible_strict_action_env
 build --host_force_python=PY3
 build --java_runtime_version=remotejdk_11
 build --tool_java_runtime_version=remotejdk_11
+build --platform_mappings=bazel/platform_mappings
 
 build --enable_platform_specific_config