diff --git a/OWNERS.md b/OWNERS.md
index c56db0d005..79a375f280 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -11,10 +11,10 @@ routing PRs, questions, etc. to the right place.
   * Envoy mobile core, C bridge layer, C++ extensions, build system, Envoy upstream.
 * Snow Pettersen ([snowp](https://github.com/snowp)) (aickck@gmail.com)
   * Envoy Upstream. Stats.
-* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)
-  * iOS (swift/objective-c) platform bindings.
 * Mike Schore ([goaway](https://github.com/goaway)) (mschore@lyft.com)
   * General.
+* JP Simard ([jpsim](https://github.com/jpsim)) (jp@lyft.com)
+  * iOS (swift/objective-c) platform bindings.
 * Charles Le Bornge ([carloseltuerto](http://github.com/carloseltuerto)) (cleborgne@google.com)
   * Cronvoy.
 
@@ -33,3 +33,7 @@ matter expert reviews. Feel free to loop them in as needed.
   * Cronet API shim aka "Cronvoy".
 * Keith Smiley ([keith](https://github.com/keith)) (keithbsmiley@gmail.com)
   * Bazel build magician
+
+# Emeritus maintainers
+
+* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
index bc5897e029..c6776df942 100644
--- a/bazel/envoy_mobile_repositories.bzl
+++ b/bazel/envoy_mobile_repositories.bzl
@@ -69,18 +69,6 @@ def upstream_envoy_overrides():
         urls = ["https://github.com/bazelbuild/rules_python/archive/6f37aa9966f53e063c41b7509a386d53a9f156c3.tar.gz"],
     )
 
-    http_archive(
-        name = "com_github_nlohmann_json",
-        # 3.10.4 introduced incompatible changes with Envoy Mobile. Until Envoy Mobile updates it's
-        # minimum iOS version to 13+ this dependency needs to be patched.
-        patches = ["@envoy_mobile//bazel:json.patch"],
-        patch_args = ["-p1"],
-        sha256 = "1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3",
-        strip_prefix = "json-3.10.4",
-        urls = ["https://github.com/nlohmann/json/archive/v3.10.4.tar.gz"],
-        build_file = "@envoy//bazel/external:json.BUILD",
-    )
-
 def swift_repos():
     http_archive(
         name = "build_bazel_rules_apple",
@@ -155,7 +143,7 @@ def kotlin_repos():
 def android_repos():
     http_archive(
         name = "build_bazel_rules_android",
-        urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
+        urls = ["https://github.com/bazelbuild/rules_android/archive/refs/tags/v0.1.1.zip"],
         sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
         strip_prefix = "rules_android-0.1.1",
     )
diff --git a/bazel/json.patch b/bazel/json.patch
deleted file mode 100644
index e09a72875a..0000000000
--- a/bazel/json.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp
-index 71e32aaf7..6a4575ecb 100644
---- a/include/nlohmann/detail/conversions/from_json.hpp
-+++ b/include/nlohmann/detail/conversions/from_json.hpp
-@@ -448,7 +448,7 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
-     }
- }
-
--#ifdef JSON_HAS_CPP_17
-+#if defined(JSON_HAS_CPP_17) && (defined(__APPLE__) && (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000))
- template<typename BasicJsonType>
- void from_json(const BasicJsonType& j, std::filesystem::path& p)
- {
-diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp
-index 79fdb3233..6a4aa7ff3 100644
---- a/include/nlohmann/detail/conversions/to_json.hpp
-+++ b/include/nlohmann/detail/conversions/to_json.hpp
-@@ -391,7 +391,7 @@ void to_json(BasicJsonType& j, const T& t)
-     to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
- }
-
--#ifdef JSON_HAS_CPP_17
-+#if defined(JSON_HAS_CPP_17) && (defined(__APPLE__) && (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000))
- template<typename BasicJsonType>
- void to_json(BasicJsonType& j, const std::filesystem::path& p)
- {
-diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
-index 87475ab31..c999784a2 100644
---- a/single_include/nlohmann/json.hpp
-+++ b/single_include/nlohmann/json.hpp
-@@ -4379,7 +4379,7 @@ void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyE
-     }
- }
-
--#ifdef JSON_HAS_CPP_17
-+#if defined(JSON_HAS_CPP_17) && (defined(__APPLE__) && (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000))
- template<typename BasicJsonType>
- void from_json(const BasicJsonType& j, std::filesystem::path& p)
- {
-@@ -5002,7 +5002,7 @@ void to_json(BasicJsonType& j, const T& t)
-     to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
- }
-
--#ifdef JSON_HAS_CPP_17
-+#if defined(JSON_HAS_CPP_17) && (defined(__APPLE__) && (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000))
- template<typename BasicJsonType>
- void to_json(BasicJsonType& j, const std::filesystem::path& p)
- {