diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 90b6079291..b04ea6af12 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -36,8 +36,7 @@
             "dnx",
             "Microsoft.AITools.BinlogMcp",
             "--yes",
-            "--source",
-            "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
+            "--prerelease"
           ],
           "tools": ["*"]
         }
diff --git a/.github/workflows/evaluation-run.yml b/.github/workflows/evaluation-run.yml
index 4a045f0f06..55c6e9af45 100644
--- a/.github/workflows/evaluation-run.yml
+++ b/.github/workflows/evaluation-run.yml
@@ -190,6 +190,11 @@ jobs:
           ref: ${{ inputs.head_sha || '' }}
           persist-credentials: false
 
+      - name: Configure NuGet for evaluations
+        run: |
+          mkdir -p "$HOME/.nuget/NuGet"
+          cp eng/evaluation/nuget.config "$HOME/.nuget/NuGet/NuGet.Config"
+
       - name: Setup Node.js
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
diff --git a/eng/allowed-external-deps.txt b/eng/allowed-external-deps.txt
index 601fde5a64..1ea36acd29 100644
--- a/eng/allowed-external-deps.txt
+++ b/eng/allowed-external-deps.txt
@@ -24,5 +24,5 @@ script:migrate-nullable-references:scripts/Get-NullableReadiness.ps1
 tool-ref:msbuild:#tool:web/fetch
 tool-ref:msbuild:#tool:agent/runSubagent
 
-# dotnet-msbuild plugin: Microsoft.AITools.BinlogMcp server (binlog analysis MCP from dotnet-public feed)
+# dotnet-msbuild plugin: Microsoft.AITools.BinlogMcp server (binlog analysis MCP)
 mcp-server:dotnet-msbuild:binlog
diff --git a/eng/evaluation/nuget.config b/eng/evaluation/nuget.config
new file mode 100644
index 0000000000..0f1bd35839
--- /dev/null
+++ b/eng/evaluation/nuget.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!-- Evaluation workspaces are created outside the repository, so the workflow
+       installs this as the runner's user-level configuration. -->
+  <packageSources>
+    <clear />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="dotnet-public">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/eng/version/nuget.config b/eng/version/nuget.config
index 99b9d316d0..3f7bf63e71 100644
--- a/eng/version/nuget.config
+++ b/eng/version/nuget.config
@@ -9,7 +9,7 @@
     PR author added to remap the nbgv package source to a malicious feed and
     achieve code execution in the privileged context. Pointing `dotnet` at this
     file with its configfile option makes NuGet use ONLY these settings (no
-    hierarchical discovery), and source mapping pins every package to nuget.org.
+    hierarchical discovery), and source mapping pins every package to dotnet-public.
 
     IMPORTANT: keep this comment free of a doubled hyphen. XML forbids the two
     hyphen sequence inside a comment, so a phrase like the configfile flag written
@@ -19,10 +19,10 @@
   -->
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
-    <packageSource key="nuget.org">
+    <packageSource key="dotnet-public">
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>
diff --git a/plugins/dotnet-msbuild/.claude-plugin/plugin.json b/plugins/dotnet-msbuild/.claude-plugin/plugin.json
index 8c1f2db492..c38c28b616 100644
--- a/plugins/dotnet-msbuild/.claude-plugin/plugin.json
+++ b/plugins/dotnet-msbuild/.claude-plugin/plugin.json
@@ -16,8 +16,7 @@
         "dnx",
         "Microsoft.AITools.BinlogMcp",
         "--yes",
-        "--source",
-        "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
+        "--prerelease"
       ],
       "tools": ["*"]
     }
diff --git a/plugins/dotnet-msbuild/.codex-plugin/.mcp.json b/plugins/dotnet-msbuild/.codex-plugin/.mcp.json
index b72ac200d4..c0d3be6827 100644
--- a/plugins/dotnet-msbuild/.codex-plugin/.mcp.json
+++ b/plugins/dotnet-msbuild/.codex-plugin/.mcp.json
@@ -7,8 +7,7 @@
         "dnx",
         "Microsoft.AITools.BinlogMcp",
         "--yes",
-        "--source",
-        "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
+        "--prerelease"
       ],
       "tools": ["*"]
     }
diff --git a/plugins/dotnet-msbuild/plugin.json b/plugins/dotnet-msbuild/plugin.json
index 8c1f2db492..c38c28b616 100644
--- a/plugins/dotnet-msbuild/plugin.json
+++ b/plugins/dotnet-msbuild/plugin.json
@@ -16,8 +16,7 @@
         "dnx",
         "Microsoft.AITools.BinlogMcp",
         "--yes",
-        "--source",
-        "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
+        "--prerelease"
       ],
       "tools": ["*"]
     }
diff --git a/plugins/dotnet-msbuild/skills/binlog-failure-analysis/SKILL.md b/plugins/dotnet-msbuild/skills/binlog-failure-analysis/SKILL.md
index 7227a7c61d..c667959482 100644
--- a/plugins/dotnet-msbuild/skills/binlog-failure-analysis/SKILL.md
+++ b/plugins/dotnet-msbuild/skills/binlog-failure-analysis/SKILL.md
@@ -33,7 +33,7 @@ Use the available MCP server tools to query the binary log for:
 ## Fallback workflow — text-log replay (when MCP is unavailable)
 
 Use this only when the MCP server cannot be started (for example, on an older
-SDK or in an offline environment without access to the `dotnet-public` NuGet feed).
+SDK or in an offline environment).
 
 ### Replay the binlog to text logs