diff --git a/src/Nocr.TextMatcher.Host/Dockerfile b/src/Nocr.TextMatcher.Host/Dockerfile
index 5612290..53d6909 100644
--- a/src/Nocr.TextMatcher.Host/Dockerfile
+++ b/src/Nocr.TextMatcher.Host/Dockerfile
@@ -8,7 +8,23 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
 
-RUN dotnet nuget add source -n "musk.fun.nocr" "https://gitea.musk.fun/api/packages/nocr/nuget/index.json" 
+# Create NuGet.Config with package source mapping to avoid NU1507 warnings
+RUN mkdir -p /root/.nuget/NuGet && \
+    echo '<?xml version="1.0" encoding="utf-8"?>' > /root/.nuget/NuGet/NuGet.Config && \
+    echo '<configuration>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  <packageSources>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <add key="musk.fun.nocr" value="https://gitea.musk.fun/api/packages/nocr/nuget/index.json" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  </packageSources>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  <packageSourceMapping>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <packageSource key="musk.fun.nocr">' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '      <package pattern="Nocr.*" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    </packageSource>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <packageSource key="nuget.org">' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '      <package pattern="*" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    </packageSource>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  </packageSourceMapping>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '</configuration>' >> /root/.nuget/NuGet/NuGet.Config 
 RUN dotnet restore "src/Nocr.TextMatcher.Host/Nocr.TextMatcher.Host.csproj"
 WORKDIR "/src/src/Nocr.TextMatcher.Host"
 RUN dotnet build "Nocr.TextMatcher.Host.csproj" -c Release -o /app/build
diff --git a/src/Nocr.TextMatcher.Migrator/Dockerfile b/src/Nocr.TextMatcher.Migrator/Dockerfile
index d31b91f..d9d6108 100644
--- a/src/Nocr.TextMatcher.Migrator/Dockerfile
+++ b/src/Nocr.TextMatcher.Migrator/Dockerfile
@@ -5,7 +5,23 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY . .
 
-RUN dotnet nuget add source -n "musk.fun.nocr" "https://gitea.musk.fun/api/packages/nocr/nuget/index.json" 
+# Create NuGet.Config with package source mapping to avoid NU1507 warnings
+RUN mkdir -p /root/.nuget/NuGet && \
+    echo '<?xml version="1.0" encoding="utf-8"?>' > /root/.nuget/NuGet/NuGet.Config && \
+    echo '<configuration>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  <packageSources>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <add key="musk.fun.nocr" value="https://gitea.musk.fun/api/packages/nocr/nuget/index.json" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  </packageSources>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  <packageSourceMapping>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <packageSource key="musk.fun.nocr">' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '      <package pattern="Nocr.*" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    </packageSource>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    <packageSource key="nuget.org">' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '      <package pattern="*" />' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '    </packageSource>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '  </packageSourceMapping>' >> /root/.nuget/NuGet/NuGet.Config && \
+    echo '</configuration>' >> /root/.nuget/NuGet/NuGet.Config 
 RUN dotnet restore "src/Nocr.TextMatcher.Migrator/Nocr.TextMatcher.Migrator.csproj"
 WORKDIR "/src/src/Nocr.TextMatcher.Migrator"
 RUN dotnet build "Nocr.TextMatcher.Migrator.csproj" -c Release -o /app/build