diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index e6a66cf06..cb0f26b5e 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -208,7 +208,7 @@ $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion))
 $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion))
 $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable))
 
-$netCoreTools = $installedSoftware.AddHeader(".NET Core Tools")
+$netCoreTools = $installedSoftware.AddHeader(".NET Tools")
 $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVersions), "^\d+\.\d+\.\d")
 $netCoreTools.AddNodes($(Get-DotnetTools))
 
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index eaa1b2db4..5bfefbfe8 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -285,6 +285,6 @@ function Get-ZstdVersion {
 }
 
 function Get-YqVersion {
-    $yqVersion = ($(yq -V) -Split " ")[-1]
-    return $yqVersion
+    $yqVersion = $(yq -V) | Take-OutputPart -Part 3
+    return $yqVersion.TrimStart("v").Trim()
 }
\ No newline at end of file
diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 698e99d85..84035f13d 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -385,12 +385,12 @@ function Get-HelmVersion {
 
 function Get-MongoVersion {
     $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3
-    return $mongo
+    return $mongo.TrimStart("v").Trim()
 }
 
 function Get-MongodVersion {
     $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2
-    return $mongod
+    return $mongod.TrimStart("v").Trim()
 }
 
 function Get-7zipVersion {