diff --git a/NuGet.Config b/NuGet.Config
index ffd10f2..167bc7a 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -2,8 +2,20 @@
 
 <configuration>
     <packageSources>
+        <clear />
         <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
         <add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
-        <add key="nuget.packages.octopushq.com" value="https://nuget.packages.octopushq.com/" />
     </packageSources>
+    
+    <packageSourceMapping>
+        <packageSource key="feedz.io">
+            <package pattern="Octopus.*" />
+        </packageSource>
+        <packageSource key="NuGet.org v3">
+            <package pattern="*" />
+            <!-- These specific packages are on NuGet.org -->
+            <package pattern="Octopus.Shellfish" />
+            <package pattern="Octopus.OctoVersion.Tool" />
+        </packageSource>
+    </packageSourceMapping>
 </configuration>
\ No newline at end of file