diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1
index 98475a036..1b8fdd8b4 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1
@@ -34,6 +34,22 @@ function Get-AndroidInstalledPackages {
 function Build-AndroidTable {
     $packageInfo = Get-AndroidInstalledPackages
     return @(
+        @{
+            "Package" = "Android Command Line Tools"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools"
+        },
+        @{
+            "Package" = "Android Emulator"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Emulator"
+        },
+        @{
+            "Package" = "Android SDK Build-tools"
+            "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
+        },
+        @{
+            "Package" = "Android SDK Platforms"
+            "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo
+        },
         @{
             "Package" = "Android SDK Platform-Tools"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"
@@ -42,30 +58,14 @@ function Build-AndroidTable {
             "Package" = "Android SDK Tools"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools"
         },
-        @{
-            "Package" = "Android Command Line Tools"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools"
-        },
-        @{
-            "Package" = "Android SDK Platforms"
-            "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo
-        },
-        @{
-            "Package" = "Android SDK Build-tools"
-            "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
-        },
-        @{
-            "Package" = "Android emulator"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Emulator"
-        },
-        @{
-            "Package" = "NDK"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
-        },
         @{
             "Package" = "Android Support Repository"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"
         },
+        @{
+            "Package" = "CMake"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
+        },
         @{
             "Package" = "Google APIs"
             "Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
@@ -79,12 +79,12 @@ function Build-AndroidTable {
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Repository"
         },
         @{
-            "Package" = "SDK Patch Applier v4"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "SDK Patch Applier v4"
+            "Package" = "NDK"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
         },
         @{
-            "Package" = "CMake"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
+            "Package" = "SDK Patch Applier v4"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "SDK Patch Applier v4"
         }
     ) | Where-Object { $_.Version } | ForEach-Object {
         [PSCustomObject] @{
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 4cfbde9f7..9d69ee1b9 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -29,106 +29,112 @@ if (Test-IsWin19)
 
 $markdown += New-MDHeader "Installed Software" -Level 2
 $markdown += New-MDHeader "Language and Runtime" -Level 3
-
-$markdown += New-MDList -Lines (Get-JavaVersionsList -DefaultVersion "1.8.0") -Style Unordered -NoNewLine
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-BashVersion),
-    (Get-PythonVersion),
-    (Get-RubyVersion),
     (Get-GoVersion),
-    (Get-PHPVersion),
+    (Get-JavaVersionsList -DefaultVersion "1.8.0")
     (Get-JuliaVersion),
+    (Get-NodeVersion),
     (Get-PerlVersion),
-    (Get-NodeVersion)
+    (Get-PHPVersion),
+    (Get-PythonVersion),
+    (Get-RubyVersion)
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "Package Management" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-ChocoVersion),
-    (Get-VcpkgVersion),
-    (Get-NPMVersion),
-    (Get-YarnVersion),
-    (Get-PipVersion),
-    (Get-CondaVersion),
-    (Get-RubyGemsVersion),
-    (Get-HelmVersion),
     (Get-ComposerVersion),
+    (Get-HelmVersion),
+    (Get-CondaVersion),
+    (Get-NPMVersion),
     (Get-NugetVersion),
-    (Get-PipxVersion)
+    (Get-PipxVersion),
+    (Get-PipVersion),
+    (Get-RubyGemsVersion),
+    (Get-VcpkgVersion),
+    (Get-YarnVersion)
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "Project Management" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-AntVersion),
-    (Get-MavenVersion),
     (Get-GradleVersion),
+    (Get-MavenVersion),
     (Get-SbtVersion)
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "Tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
+    (Get-7zipVersion),
     (Get-AzCopyVersion),
     (Get-BazelVersion),
     (Get-BazeliskVersion),
+    (Get-CabalVersion),
     (Get-CMakeVersion),
     (Get-CodeQLBundleVersion),
-    (Get-RVersion),
     (Get-DockerVersion),
     (Get-DockerComposeVersion),
+    (Get-GHCVersion),
     (Get-GitVersion),
     (Get-GitLFSVersion),
     (Get-GoogleCloudSDKVersion),
     (Get-InnoSetupVersion),
     (Get-JQVersion),
-    (Get-KubectlVersion),
     (Get-KindVersion),
-    (Get-MinGWVersion),
+    (Get-KubectlVersion),
     (Get-MercurialVersion),
-    (Get-NSISVersion),
+    (Get-MinGWVersion),
     (Get-NewmanVersion),
+    (Get-NSISVersion),
     (Get-OpenSSLVersion),
     (Get-PackerVersion),
     (Get-PulumiVersion),
-    (Get-SVNVersion),
-    (Get-GHCVersion),
-    (Get-CabalVersion),
+    (Get-RVersion),
     (Get-StackVersion),
+    (Get-SVNVersion),
+    (Get-VSWhereVersion),
     (Get-WinAppDriver),
     (Get-ZstdVersion),
-    (Get-VSWhereVersion),
-    (Get-7zipVersion),
     (Get-YAMLLintVersion)
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "CLI Tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
-    (Get-AzureCLIVersion),
-    (Get-AzureDevopsExtVersion),
-    (Get-AZDSVersion),
+$markdown += New-MDList -Style Unordered -Lines (@(
+    (Get-AlibabaCLIVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMVersion),
     (Get-AWSSessionManagerVersion),
-    (Get-AlibabaCLIVersion),
+    (Get-AzureCLIVersion),
+    (Get-AZDSVersion),
+    (Get-AzureDevopsExtVersion),
     (Get-CloudFoundryVersion),
-    (Get-HubVersion),
-    (Get-GHVersion)
+    (Get-GHVersion),
+    (Get-HubVersion)
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "Rust Tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     "Rust $(Get-RustVersion)",
     "Rustup $(Get-RustupVersion)",
     "Cargo $(Get-RustCargoVersion)",
     "Rustdoc $(Get-RustdocVersion)"
+    ) | Sort-Object
 )
+
 $markdown += New-MDHeader "Packages" -Level 4
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-BindgenVersion),
-    (Get-CbindgenVersion),
     (Get-CargoAuditVersion),
     (Get-CargoOutdatedVersion),
     "Rustfmt $(Get-RustfmtVersion)",
     "Clippy $(Get-RustClippyVersion)"
+    ) | Sort-Object
 )
 
 $markdown += New-MDHeader "Browsers and webdrivers" -Level 3
@@ -175,11 +181,12 @@ $markdown += Build-DatabasesMarkdown
 $markdown += New-MDNewLine
 
 $markdown += New-MDHeader "Database tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-AzCosmosDBEmulatorVersion),
     (Get-DacFxVersion),
-    (Get-SQLPSVersion),
-    (Get-MySQLVersion)
+    (Get-MySQLVersion),
+    (Get-SQLPSVersion)
+    ) | Sort-Object
 )
 $markdown += New-MDNewLine