diff --git a/src/Nocr.Users.Host/Dockerfile b/src/Nocr.Users.Host/Dockerfile
index 551cd20..9317d82 100644
--- a/src/Nocr.Users.Host/Dockerfile
+++ b/src/Nocr.Users.Host/Dockerfile
@@ -14,25 +14,10 @@ RUN apt-get update && \
 
 COPY . .
 
-# 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
+# Add custom NuGet source (no API key needed for public read access)
+RUN dotnet nuget add source https://gitea.musk.fun/api/packages/nocr/nuget/index.json --name musk
 
-# Restore with verbose logging to see what's happening
+# Restore with verbose logging
 RUN dotnet restore "src/Nocr.Users.Host/Nocr.Users.Host.csproj" --verbosity normal
 WORKDIR "/src/src/Nocr.Users.Host"
 RUN dotnet build "Nocr.Users.Host.csproj" -c Release -o /app/build
diff --git a/src/Nocr.Users.Migrator/Dockerfile b/src/Nocr.Users.Migrator/Dockerfile
index f98a5af..79150df 100644
--- a/src/Nocr.Users.Migrator/Dockerfile
+++ b/src/Nocr.Users.Migrator/Dockerfile
@@ -14,25 +14,10 @@ RUN apt-get update && \
 
 COPY . .
 
-# 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
+# Add custom NuGet source (no API key needed for public read access)
+RUN dotnet nuget add source https://gitea.musk.fun/api/packages/nocr/nuget/index.json --name musk
 
-# Restore with verbose logging to see what's happening
+# Restore with verbose logging
 RUN dotnet restore "src/Nocr.Users.Migrator/Nocr.Users.Migrator.csproj" --verbosity normal
 WORKDIR "/src/src/Nocr.Users.Migrator"
 RUN dotnet build "Nocr.Users.Migrator.csproj" -c Release -o /app/build