diff --git a/images/windows/scripts/helpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1
index 7332d0e13..610aee8fb 100644
--- a/images/windows/scripts/helpers/ChocoHelpers.ps1
+++ b/images/windows/scripts/helpers/ChocoHelpers.ps1
@@ -77,13 +77,12 @@ function Resolve-ChocoPackageVersion {
         [string] $TargetVersion
     )
 
-    $versionNumbers = $TargetVersion.Split(".")
-    [int] $versionNumbers[-1] += 1
-    $incrementedVersion = $versionNumbers -join "."
-    $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')"
-    $latestVersion = (Invoke-RestMethod "https://community.chocolatey.org/api/v2/Packages()?$filterQuery").properties.Version |
-        Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } |
-        Sort-Object { [version] $_ } |
+    $searchResult = choco search $PackageName --exact --all-versions --approved-only --limit-output | 
+        ConvertFrom-CSV -Delimiter '|' -Header 'Name', 'Version'
+
+    $latestVersion = $searchResult.Version | 
+        Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } | 
+        Sort-Object { [version] $_ } | 
         Select-Object -Last 1
 
     return $latestVersion