diff --git a/.bazelrc b/.bazelrc
index 70a756fcd1..cc7f0f7a24 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -28,6 +28,8 @@ build --define cxxopts=-std=c++17
 # More information on stamping can be found here:
 # https://github.com/envoyproxy/envoy/tree/master/bazel#enabling-optional-features
 build:ios --define=manual_stamp=manual_stamp
+# https://github.com/bazelbuild/bazel/issues/10674#issuecomment-658208918
+build:ios --incompatible_objc_compile_info_migration
 
 # Default flags for builds targeting Android
 build:android --define logger=android
diff --git a/.bazelversion b/.bazelversion
index 944880fa15..47b322c971 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.2.0
+3.4.1
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
index 553f135a52..63e2e1a035 100644
--- a/bazel/envoy_mobile_repositories.bzl
+++ b/bazel/envoy_mobile_repositories.bzl
@@ -67,16 +67,16 @@ def upstream_envoy_overrides():
 def swift_repos():
     http_archive(
         name = "build_bazel_rules_apple",
-        sha256 = "4300f45136dbe2edfa1ad38995760170a64006a5a14adfbe13c401668ec4c7da",
-        strip_prefix = "rules_apple-d9c827bf407793b37aa0e205a0730005c76ef7e8",
-        url = "https://github.com/bazelbuild/rules_apple/archive/d9c827bf407793b37aa0e205a0730005c76ef7e8.tar.gz",
+        sha256 = "8219971a5e7bb00827239ff997a3a5bde35fc06f29595f6861fc79528f370e20",
+        strip_prefix = "rules_apple-b35ed275931a316b34089fc7fa5e1f20fbf8a15d",
+        url = "https://github.com/bazelbuild/rules_apple/archive/b35ed275931a316b34089fc7fa5e1f20fbf8a15d.tar.gz",
     )
 
     http_archive(
         name = "build_bazel_rules_swift",
-        sha256 = "655bff6cd7ab989cceaa08b22956d775744c39aebaa3caa651a556590acec96c",
-        strip_prefix = "rules_swift-15d2b18ac7a71796984c4064fc0b570260969ac3",
-        url = "https://github.com/bazelbuild/rules_swift/archive/15d2b18ac7a71796984c4064fc0b570260969ac3.tar.gz",
+        sha256 = "e571fd8920dbca579b042ce8350e13639d10d3386a7fa2518956b25c7c70e758",
+        strip_prefix = "rules_swift-f868e5fcf89d1639b9c1593f920dae30e10cfc72",
+        url = "https://github.com/bazelbuild/rules_swift/archive/f868e5fcf89d1639b9c1593f920dae30e10cfc72.tar.gz",
     )
 
 def kotlin_repos():
diff --git a/bazel/swift_static_framework.bzl b/bazel/swift_static_framework.bzl
index ed79cf0d31..aab846e1fc 100644
--- a/bazel/swift_static_framework.bzl
+++ b/bazel/swift_static_framework.bzl
@@ -136,8 +136,8 @@ _swift_static_framework = rule(
             cfg = "host",
             executable = True,
         ),
-        _whitelist_function_transition = attr.label(
-            default = "@build_bazel_rules_apple//tools/whitelists/function_transition_whitelist",
+        _allowlist_function_transition = attr.label(
+            default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
         ),
         _zipper = attr.label(
             default = "@bazel_tools//tools/zip:zipper",
diff --git a/envoy b/envoy
index 7d8b9acbbd..e6c57fab80 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 7d8b9acbbd27e1d1aac966def59a9474d53c125d
+Subproject commit e6c57fab8022d9df228052f1f517a57584030654
diff --git a/library/common/http/header_utility.cc b/library/common/http/header_utility.cc
index 32e284876e..2dcddd03bc 100644
--- a/library/common/http/header_utility.cc
+++ b/library/common/http/header_utility.cc
@@ -39,24 +39,20 @@ envoy_headers toBridgeHeaders(const HeaderMap& header_map) {
   transformed_headers.length = 0;
   transformed_headers.headers = headers;
 
-  header_map.iterate(
-      [](const HeaderEntry& header, void* context) -> HeaderMap::Iterate {
-        envoy_headers* transformed_headers = static_cast<envoy_headers*>(context);
+  header_map.iterate([&transformed_headers](const HeaderEntry& header) -> HeaderMap::Iterate {
+    const absl::string_view header_key = header.key().getStringView();
+    const absl::string_view header_value = header.value().getStringView();
 
-        const absl::string_view header_key = header.key().getStringView();
-        const absl::string_view header_value = header.value().getStringView();
+    envoy_data key =
+        copy_envoy_data(header_key.size(), reinterpret_cast<const uint8_t*>(header_key.data()));
+    envoy_data value =
+        copy_envoy_data(header_value.size(), reinterpret_cast<const uint8_t*>(header_value.data()));
 
-        envoy_data key =
-            copy_envoy_data(header_key.size(), reinterpret_cast<const uint8_t*>(header_key.data()));
-        envoy_data value = copy_envoy_data(header_value.size(),
-                                           reinterpret_cast<const uint8_t*>(header_value.data()));
+    transformed_headers.headers[transformed_headers.length] = {key, value};
+    transformed_headers.length++;
 
-        transformed_headers->headers[transformed_headers->length] = {key, value};
-        transformed_headers->length++;
-
-        return HeaderMap::Iterate::Continue;
-      },
-      &transformed_headers);
+    return HeaderMap::Iterate::Continue;
+  });
   return transformed_headers;
 }