diff --git a/Documentation/guides/OneDotNet.md b/Documentation/guides/OneDotNet.md
index acdd9fbecfe..50f7e47dbe6 100644
--- a/Documentation/guides/OneDotNet.md
+++ b/Documentation/guides/OneDotNet.md
@@ -299,7 +299,7 @@ see the [net6-samples][net6-samples] repo.
 
 ## Package Versioning Scheme
 
-This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prereleaseX]+sha.1b2c3d4`.
+This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prereleaseX].CommitDistance`.
 
 * Major: The highest stable API level, such as 30. On Apple platforms, this is the major OS version.
 * Minor: Always 0 for Android. On Apple platforms, this is the minor OS version.
@@ -327,24 +327,6 @@ This is the package version scheme: `OS-Major.OS-Minor.InternalRelease[-prerelea
           referencing `*-android-r.beta.*`
         * It's still possible to sign up for all `android-r` builds, by
           referencing `*-ci.android-r.*`
-* Build metadata: Required Hash
-    * This is `sha.` + the short commit hash.
-        * Use the short hash because the long hash is quite long and
-          cumbersome. This leaves the complete version open for duplication,
-          but this is extremely unlikely.
-    * Example: `30.0.100+sha.1a2b3c`
-    * Example (CI build): `30.0.100-ci.master.1234+sha.1a2b3c`
-    * Since the build metadata is required for all builds, we're able to
-      recognize incomplete version numbers and determine if a particular
-      version string refers to a stable version or not.
-        * Example: `30.0.100`: incomplete version
-        * Example: `30.0.100+sha.1a2b3c`: stable
-        * Example: `30.0.100-ci.d17-0.1234+sha.1a2b3c`: CI build
-        * Example: `30.0.100-android-r.beta.1+sha.1a2b3c`: official
-          preview
-            * Technically it's possible to remove the prerelease part, but
-              we’d still be able to figure out it’s not a stable version by
-              using the commit hash.
 
 
 [0]: https://github.com/dotnet/installer#installers-and-binaries
diff --git a/build-tools/create-packs/Directory.Build.props b/build-tools/create-packs/Directory.Build.props
index 30698c4505f..e349836272d 100644
--- a/build-tools/create-packs/Directory.Build.props
+++ b/build-tools/create-packs/Directory.Build.props
@@ -4,6 +4,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageType>DotnetPlatform</PackageType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <OutputPath>$(BootstrapOutputDirectory)nuget-unsigned\</OutputPath>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 9062956cbae..92e78a046bb 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -39,7 +39,7 @@
   <Target Name="_GetDefaultPackageVersion"
       DependsOnTargets="GetXAVersionInfo" >
     <PropertyGroup>
-      <PackageVersion>$(AndroidPackVersionLong)+sha.$(XAVersionHash)</PackageVersion>
+      <PackageVersion>$(AndroidPackVersionLong)</PackageVersion>
     </PropertyGroup>
   </Target>
 
diff --git a/build-tools/create-packs/Icon.png b/build-tools/create-packs/Icon.png
new file mode 100644
index 00000000000..fb00ecf91e4
Binary files /dev/null and b/build-tools/create-packs/Icon.png differ
diff --git a/build-tools/create-packs/License.targets b/build-tools/create-packs/License.targets
index 5f6162b8903..e3c66cc5d59 100644
--- a/build-tools/create-packs/License.targets
+++ b/build-tools/create-packs/License.targets
@@ -3,10 +3,13 @@
   <PropertyGroup>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageProjectUrl>https://github.com/dotnet/android</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dotnet/android</RepositoryUrl>
+    <PackageProjectUrl>https://dot.net</PackageProjectUrl>
+    <Owners>microsoft,dotnetframework</Owners>
     <NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
     <NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
     <PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>
+    <PackageIcon>Icon.png</PackageIcon>
     <BeforePack>_GetLicense;$(BeforePack)</BeforePack>
   </PropertyGroup>
   <Target Name="_GetLicense">
@@ -19,6 +22,7 @@
     <ItemGroup>
       <_PackageFiles Include="$(IntermediateOutputPath)$(PackageLicenseFile)" PackagePath="\" />
       <_PackageFiles Include="$(XAInstallPrefix)THIRD-PARTY-NOTICES.TXT" PackagePath="\" />
+      <_PackageFiles Include="$(MSBuildThisFileDirectory)Icon.png" PackagePath="\" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Microsoft.Android.Templates/Directory.Build.targets b/src/Microsoft.Android.Templates/Directory.Build.targets
index 9a0c7d5ff18..cb4a645c869 100644
--- a/src/Microsoft.Android.Templates/Directory.Build.targets
+++ b/src/Microsoft.Android.Templates/Directory.Build.targets
@@ -9,7 +9,7 @@
   <Target Name="_GetDefaultPackageVersion"
       DependsOnTargets="GetXAVersionInfo" >
     <PropertyGroup>
-      <TemplatePackVersion Condition="'$(TemplatePackVersion)' == ''">$(AndroidPackVersionLong)+sha.$(XAVersionHash)</TemplatePackVersion>
+      <TemplatePackVersion Condition="'$(TemplatePackVersion)' == ''">$(AndroidPackVersionLong)</TemplatePackVersion>
       <PackageVersion>$(TemplatePackVersion)</PackageVersion>
     </PropertyGroup>
   </Target>