diff --git a/.gitmodules b/.gitmodules
index f8838a54d10..c9a9fb532e1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,5 +40,5 @@
     branch = 3.35.2
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
-    url = https://github.com/xamarin/xamarin-android-tools
-    branch = main
+    url = https://github.com/grendello/xamarin-android-tools
+    branch = update-mono.unix
diff --git a/Directory.Build.props b/Directory.Build.props
index 11c32ae8d20..a91d924c5c7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -42,7 +42,7 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.4</LibZipSharpVersion>
+    <LibZipSharpVersion>2.0.5</LibZipSharpVersion>
     <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
index c8382018794..6a75be1ba23 100644
--- a/build-tools/xaprepare/xaprepare/xaprepare.csproj
+++ b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -52,7 +52,7 @@
     <PackageReference Include="7-Zip.CommandLine" Version="18.1.0" GeneratePathProperty="true" />
     <PackageReference Include="Kajabity.Tools.Java" Version="0.2.6862.30334" />
     <PackageReference Include="Mono.Options" Version="$(MonoOptionsVersion)" />
-    <PackageReference Include="Mono.Unix" Version="7.0.0-final.1.21369.2" />
+    <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     <PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 9c641b3e08e..2ee4979ae40 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef
+Subproject commit 2ee4979ae40a58275310beea31c617f2551e2686