diff --git a/BC.HelperFunctions.ps1 b/BC.HelperFunctions.ps1
index 94008d1d3..57847f58d 100644
--- a/BC.HelperFunctions.ps1
+++ b/BC.HelperFunctions.ps1
@@ -19,7 +19,7 @@ function Get-ContainerHelperConfig {
             "useWinRmSession" = "allow"   # allow, always, never
             "addTryCatchToScriptBlock" = $true
             "killPsSessionProcess" = $false
-            "usePrereleaseAlTool" = $true
+            "usePrereleaseAlTool" = $false
             "useVolumes" = $false
             "useVolumeForMyFolder" = $false
             "use7zipIfAvailable" = $true
diff --git a/NuGet/NuGetFeedClass.ps1 b/NuGet/NuGetFeedClass.ps1
index 117dbe06c..af1cbeb10 100644
--- a/NuGet/NuGetFeedClass.ps1
+++ b/NuGet/NuGetFeedClass.ps1
@@ -95,7 +95,14 @@ class NuGetFeed {
                     "Authorization" = "Bearer $($this.token)"
                 }
             }
-            $queryUrl = "https://api.github.com/orgs/$organization/packages?package_type=nuget&per_page=100&page="
+            $orgMetadata = Invoke-RestMethod -Method GET -Uri "https://api.github.com/users/$organization"
+            if ($orgMetadata.type -eq 'Organization') {
+                $orgType = 'orgs'
+            }
+            else {
+                $orgType = 'users'
+            }
+            $queryUrl = "https://api.github.com/$orgType/$organization/packages?package_type=nuget&per_page=100&page="
             $page = 1
             Write-Host -ForegroundColor Yellow "Search package using $queryUrl$page"
             $matching = @()
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 68c911cdf..aea4c22db 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,5 @@
 6.0.23
+Issue 3573 GitHub NuGet Handling fails for User Feeds
 
 6.0.22
 Issue #3660 Error about missing 'azuredevops' property when using Compile-AppWithBcCompilerFolder