diff --git a/.github/workflows/component-common.yml b/.github/workflows/component-common.yml
index 80f6ea8e7b..4909d6736a 100644
--- a/.github/workflows/component-common.yml
+++ b/.github/workflows/component-common.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-common.yml
diff --git a/.github/workflows/component-configuration.yml b/.github/workflows/component-configuration.yml
index f0cae5d49c..3f6cc30272 100644
--- a/.github/workflows/component-configuration.yml
+++ b/.github/workflows/component-configuration.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-configuration.yml
diff --git a/.github/workflows/component-connectors.yml b/.github/workflows/component-connectors.yml
index 375c7677f9..43f173b6f4 100644
--- a/.github/workflows/component-connectors.yml
+++ b/.github/workflows/component-connectors.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-connectors.yml
diff --git a/.github/workflows/component-discovery.yml b/.github/workflows/component-discovery.yml
index 12bf4088a7..7e991eb1db 100644
--- a/.github/workflows/component-discovery.yml
+++ b/.github/workflows/component-discovery.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-discovery.yml
diff --git a/.github/workflows/component-logging.yml b/.github/workflows/component-logging.yml
index 1a453d26a8..1ad817653a 100644
--- a/.github/workflows/component-logging.yml
+++ b/.github/workflows/component-logging.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-logging.yml
diff --git a/.github/workflows/component-management.yml b/.github/workflows/component-management.yml
index e3a01e34f8..da124fbeea 100644
--- a/.github/workflows/component-management.yml
+++ b/.github/workflows/component-management.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-management.yml
diff --git a/.github/workflows/component-security.yml b/.github/workflows/component-security.yml
index cfe3a805f5..25658195ec 100644
--- a/.github/workflows/component-security.yml
+++ b/.github/workflows/component-security.yml
@@ -8,6 +8,7 @@ on:
     - stylecop.json
     - '*.props'
     - '*.ruleset'
+    - nuget.config
     - .config/dotnet-tools.json
     - .github/workflows/component-shared-workflow.yml
     - .github/workflows/component-security.yml
diff --git a/nuget.config b/nuget.config
index f5253c498c..d363dbb2bd 100644
--- a/nuget.config
+++ b/nuget.config
@@ -1,8 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <!-- Required for .NET Aspire Configuration Schema Generator, which needs System.CommandLine. -->
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet-libraries">
+      <!-- Required for .NET Aspire Configuration Schema Generator, which needs System.CommandLine. -->
+      <package pattern="System.CommandLine" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>