diff --git a/README.md b/README.md
index fed05e4..2f300db 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ $ dotnet new install Steeltoe.NetCoreTool.Templates
 ### From .NET Foundation (staging)
 
 ```
-$ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json -n SteeltoeDev
+$ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json -n Steeltoe-ci
 $ dotnet new install Steeltoe.NetCoreTool.Templates
 ```
 
diff --git a/nuget.config b/nuget.config
deleted file mode 100644
index 21cb6ef..0000000
--- a/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json
index cb69b62..4f23b24 100644
--- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json
+++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json
@@ -24,9 +24,9 @@
           }
         },
         {
-          "id": "4.0.*-*",
+          "id": "4.0.*",
           "name": {
-            "text": "Steeltoe 4.0 (pre-release)"
+            "text": "Steeltoe 4.0"
           }
         },
         {
@@ -36,7 +36,7 @@
           }
         }
       ],
-      "defaultValue": "4.0.*-*"
+      "defaultValue": "4.0.*"
     },
     {
       "id": "DescriptionOption",
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json
index 96d5c0e..8d227ea 100644
--- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json
+++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json
@@ -115,7 +115,7 @@
       "description": "The Steeltoe version to use.",
       "type": "parameter",
       "datatype": "string",
-      "defaultValue": "4.0.*-*",
+      "defaultValue": "4.0.*",
       "replaces": "$(SteeltoeVersionInCLI)"
     },
     "IsSteeltoeV3InCLI": {
@@ -153,7 +153,7 @@
           "choice": "3.2.*"
         },
         {
-          "choice": "4.0.*-*"
+          "choice": "4.0.*"
         },
         {
           "choice": "4.*-main-*"
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config
index fe514da..5a432cb 100644
--- a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config
+++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="SteeltoeDev" value="https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json" />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="Steeltoe-ci" value="https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="Steeltoe-ci">
+      <package pattern="Steeltoe.*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>