diff --git a/.github/workflows/package-unsigned.yml b/.github/workflows/package-unsigned.yml
index 515a009..ce2612b 100644
--- a/.github/workflows/package-unsigned.yml
+++ b/.github/workflows/package-unsigned.yml
@@ -170,6 +170,13 @@ jobs:
             exit 1
           }
 
+          $anyMatches = Get-ChildItem -Path (Join-Path $pkgDir 'CosmosDBShell.any.*.nupkg') -ErrorAction SilentlyContinue
+          if ($anyMatches -and $anyMatches.Count -gt 0) {
+            $names = $anyMatches | ForEach-Object { $_.Name } | Sort-Object
+            Write-Error "Unexpected any-RID package(s) found: $($names -join ', ')"
+            exit 1
+          }
+
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/.pipelines/CosmosDB-Shell-Official.yml b/.pipelines/CosmosDB-Shell-Official.yml
index 561a89a..35d41e4 100644
--- a/.pipelines/CosmosDB-Shell-Official.yml
+++ b/.pipelines/CosmosDB-Shell-Official.yml
@@ -518,7 +518,7 @@ extends:
                   eq('${{ parameters.publishNuget }}', 'true'))
                 inputs:
                   command: "push"
-                  packagesToPush: "$(Build.SourcesDirectory)\\out\\nupkg\\CosmosDBShell.$(CosmosDBShell_PackageVersion).nupkg"
+                  packagesToPush: "$(Build.SourcesDirectory)\out\nupkg\CosmosDBShell.$(CosmosDBShell_PackageVersion).nupkg"
                   nuGetFeedType: "internal"
                   publishVstsFeed: "CosmosDB/CosmosDBShell"
                   allowPackageConflicts: true