diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
index d8880a6ab2f..d91dbecb512 100644
--- a/build-tools/installers/create-installers.targets
+++ b/build-tools/installers/create-installers.targets
@@ -277,6 +277,7 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)System.CodeDom.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)System.Collections.Immutable.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)System.Buffers.dll" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)System.IO.Hashing.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Aapt.targets" ExcludeFromAndroidNETSdk="true" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Aapt2.targets" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Analysis.targets" />
@@ -322,7 +323,6 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)K4os.Compression.LZ4.dll" />
-    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)K4os.Hash.xxHash.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ELFSharp.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ManifestOverlays\Timing.xml" />
   </ItemGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 33b4096ba6d..6a87fc3330f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,6 +16,10 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
     </Dependency>
+    <Dependency Name="System.IO.Hashing" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22103.1">
diff --git a/eng/Versions.props b/eng/Versions.props
index 926781e3a0a..243726f60df 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,6 +9,7 @@
     <MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>8.0.0-alpha.1.23077.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
+    <SystemIOHashingPackageVersion>8.0.0-alpha.1.23080.2</SystemIOHashingPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Match the first three version numbers and append 00 -->
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreIndexEntry.cs b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreIndexEntry.cs
index 59f012f5142..51d2bd8ca77 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreIndexEntry.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/AssemblyStoreIndexEntry.cs
@@ -1,8 +1,7 @@
 using System;
+using System.IO.Hashing;
 using System.Text;
 
-using K4os.Hash.xxHash;
-
 namespace Xamarin.Android.Tasks
 {
 	class AssemblyStoreIndexEntry
@@ -37,8 +36,8 @@ public AssemblyStoreIndexEntry (string name, uint blobID, uint mappingIndex, uin
 			LocalBlobIndex = localBlobIndex;
 
 			byte[] nameBytes = Encoding.UTF8.GetBytes (name);
-			NameHash32 = XXH32.DigestOf (nameBytes, 0, nameBytes.Length);
-			NameHash64 = XXH64.DigestOf (nameBytes, 0, nameBytes.Length);
+			NameHash32 = XxHash32.HashToUInt32 (nameBytes);
+			NameHash64 = XxHash64.HashToUInt64 (nameBytes);
 		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
index 734ece97e18..374a432e76a 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrComposer.cs
@@ -1,9 +1,8 @@
 using System;
 using System.IO;
+using System.IO.Hashing;
 using System.Text;
 
-using K4os.Hash.xxHash;
-
 using Xamarin.Android.Tools;
 
 namespace Xamarin.Android.Tasks.LLVMIR
@@ -45,10 +44,10 @@ protected ulong HashName (string name, bool is64Bit)
 		{
 			byte[] nameBytes = Encoding.UTF8.GetBytes (name);
 			if (is64Bit) {
-				return XXH64.DigestOf (nameBytes, 0, nameBytes.Length);
+				return XxHash64.HashToUInt64 (nameBytes);
 			}
 
-			return (ulong)XXH32.DigestOf (nameBytes, 0, nameBytes.Length);
+			return (ulong)XxHash32.HashToUInt32 (nameBytes);
 		}
 
 		protected virtual void InitGenerator (LlvmIrGenerator generator)
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
index 1152841c654..bc407b478aa 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO.Hashing;
 using System.Linq;
 using System.Text;
 
-using K4os.Hash.xxHash;
 using Xamarin.Android.Tasks.LLVMIR;
 
 namespace Xamarin.Android.Tasks
@@ -306,10 +306,10 @@ ulong HashName (string name)
 			ulong HashBytes (byte[] bytes)
 			{
 				if (is64Bit) {
-					return XXH64.DigestOf (bytes, 0, bytes.Length);
+					return XxHash64.HashToUInt64 (bytes);
 				}
 
-				return (ulong)XXH32.DigestOf (bytes, 0, bytes.Length);
+				return (ulong)XxHash32.HashToUInt32 (bytes);
 			}
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index dd902240461..10042969a49 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -52,10 +52,10 @@
     <PackageReference Include="NuGet.Protocol" Version="$(NuGetApiPackageVersion)" />
     <PackageReference Include="NuGet.Versioning" Version="$(NuGetApiPackageVersion)" />
     <PackageReference Include="System.CodeDom" />
+    <PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="6.0.1" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
-    <PackageReference Include="K4os.Hash.xxHash" Version="1.0.6" />
     <PackageReference Include="ELFSharp" Version="$(ELFSharpVersion)" />
   </ItemGroup>