diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1
index a93910e1..94449ee0 100644
--- a/images/macos/software-report/SoftwareReport.Android.psm1
+++ b/images/macos/software-report/SoftwareReport.Android.psm1
@@ -39,37 +39,41 @@ function Build-AndroidTable {
     $packageInfo = Get-AndroidInstalledPackages
     return @(
         @{
-            "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 Emulator"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Emulator"
         },
         @{
             "Package" = "Android SDK Build-tools"
             "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
         },
         @{
-            "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 Platform-Tools"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"
         },
         @{
-            "Package" = "Android emulator"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Emulator"
-        },
-        @{
-            "Package" = "Google APIs"
-            "Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
+            "Package" = "Android SDK Tools"
+            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools"
         },
         @{
             "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
+        },
         @{
             "Package" = "Google Play services"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Play services"
@@ -78,17 +82,13 @@ function Build-AndroidTable {
             "Package" = "Google Repository"
             "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Repository"
         },
-        @{
-            "Package" = "SDK Patch Applier v4"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "SDK Patch Applier v4"
-        },
-        @{
-            "Package" = "CMake"
-            "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
-        },
         @{
             "Package" = "NDK"
             "Version" = Get-AndroidNDKVersions -PackageInfo $packageInfo
+        },
+        @{
+            "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/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 3a7ec61b..bd2a1443 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -467,4 +467,4 @@ function Get-SwiftLintVersion {
 function Get-PowershellVersion {
     $powershellVersion = Run-Command "powershell --version"
     return $powershellVersion
-}
+}
\ No newline at end of file
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 62cba7dc..dacf185f 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -29,21 +29,7 @@ $markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageN
 # Software report
 $markdown += New-MDHeader "Installed Software" -Level 2
 $markdown += New-MDHeader "Language and Runtime" -Level 3
-
-if ( -not $os.IsHighSierra) {
-    $clangLLVMVersion = Get-ClangLLVMVersion
-    $gccVersion = Get-GccVersion
-    $gfortranVersion = Get-FortranVersion
-    $lines = @($clangLLVMVersion, $gccVersion, $gfortranVersion) | ForEach-Object {$_}
-    $markdown += New-MDList -Style Unordered -NoNewLine -Lines $lines
-}
-
-if ($os.IsLessThanBigSur) {
-    $markdown += New-MDList -Style Unordered -Lines @(Get-RVersion) -NoNewLine
-}
-
-# Language and Runtime
-$markdown += New-MDList -Style Unordered -Lines @(
+$languageAndRuntimeList = @(
     (Get-BashVersion),
     (Get-NodeVersion),
     (Get-NVMVersion),
@@ -57,13 +43,25 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-JuliaVersion)
 )
 
-# Package Management
-$markdown += New-MDHeader "Package Management" -Level 3
-if ($os.IsHigherThanMojave) {
-    $markdown += New-MDList -Lines (Get-VcpkgVersion) -Style Unordered -NoNewLine
+if ( -not $os.IsHighSierra) {
+    $languageAndRuntimeList += @(
+        (Get-GccVersion)
+        (Get-FortranVersion)
+        (Get-ClangLLVMVersion)
+    )
 }
 
-$markdown += New-MDList -Style Unordered -Lines @(
+if ($os.IsLessThanBigSur) {
+    $languageAndRuntimeList += @(
+        (Get-RVersion)
+    )
+}
+
+$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object)
+
+# Package Management
+$markdown += New-MDHeader "Package Management" -Level 3
+$packageManagementList = @(
     (Get-PipVersion -Version 2),
     (Get-PipVersion -Version 3),
     (Get-PipxVersion),
@@ -79,17 +77,26 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-ComposerVersion)
 )
 
+if ($os.IsHigherThanMojave) {
+    $packageManagementList += @(
+        (Get-VcpkgVersion)
+    )
+}
+
+$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object)
+
 # Project Management
 $markdown += New-MDHeader "Project Management" -Level 3
-$markdown += New-MDList -Style Unordered -Lines @(
+$markdown += New-MDList -Style Unordered -Lines (@(
     (Get-MavenVersion),
     (Get-GradleVersion),
     (Get-ApacheAntVersion)
+    ) | Sort-Object
 )
 
 # Utilities
 $markdown += New-MDHeader "Utilities" -Level 3
-$markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
+$utilitiesList = @(
     (Get-CurlVersion),
     (Get-GitVersion),
     (Get-GitLFSVersion),
@@ -115,21 +122,27 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
     (Get-BsdtarVersion),
     (Get-GnuTarVersion)
 )
+
 if ($os.IsHigherThanMojave) {
-    $markdown += New-MDList -Lines (Get-NewmanVersion) -Style Unordered -NoNewLine
+    $utilitiesList += @(
+        (Get-NewmanVersion)
+    )
 }
+
 if ($os.IsLessThanBigSur) {
-    $markdown += New-MDList -Style Unordered -Lines @(
+    $utilitiesList += @(
         (Get-VirtualBoxVersion),
         (Get-VagrantVersion),
         (Get-ParallelVersion)
     )
 }
+
+$markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object)
 $markdown += New-MDNewLine
 
 # Tools
 $markdown += New-MDHeader "Tools" -Level 3
-$markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
+$toolsList = @(
     (Get-FastlaneVersion),
     (Get-CmakeVersion),
     (Get-AppCenterCLIVersion),
@@ -142,7 +155,7 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
 )
 
 if( -not $os.IsHighSierra) {
-    $markdown += New-MDList -Style Unordered -Lines @(
+    $toolsList += @(
         (Get-GHCupVersion),
         (Get-GHCVersion),
         (Get-CabalVersion),
@@ -150,43 +163,51 @@ if( -not $os.IsHighSierra) {
     )
 }
 
+$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
+
 # Linters
 $markdown += New-MDHeader "Linters" -Level 3
-$markdown += New-MDList -Style Unordered -NoNewLine -Lines @(
+$lintersList = @(
     (Get-YamllintVersion)
 )
 
 if ( -not $os.IsHighSierra) {
-    $markdown += New-MDList -Style Unordered -Lines @(
+    $lintersList += @(
         (Get-SwiftLintVersion)
     )
 }
 
+$markdown += New-MDList -Style Unordered -Lines ($lintersList | Sort-Object)
+
 $markdown += New-MDHeader "Browsers" -Level 3
 $markdown += Get-BrowserSection
 
 $markdown += New-MDHeader "Java" -Level 3
 $markdown += Get-JavaVersions | New-MDTable
+$markdown += New-MDNewLine
 
 # Toolcache
 $markdown += Build-ToolcacheSection
 
 if ( -not $os.IsHighSierra) {
     $markdown += New-MDHeader "Rust Tools" -Level 3
-    $markdown += New-MDList -Style Unordered -Lines @(
+    $markdown += New-MDList -Style Unordered -Lines (@(
         (Get-RustVersion),
         (Get-RustupVersion),
         (Get-RustdocVersion),
         (Get-RustCargoVersion)
+        ) | Sort-Object
     )
+    
     $markdown += New-MDHeader "Packages" -Level 4
-    $markdown += New-MDList -Style Unordered -Lines @(
+    $markdown += New-MDList -Style Unordered -Lines (@(
         (Get-Bindgen),
         (Get-Cbindgen),
         (Get-Cargooutdated),
         (Get-Cargoaudit),
         (Get-RustfmtVersion),
         (Get-RustClippyVersion)
+        ) | Sort-Object
     )
 }