diff --git a/IdentityServer/v7/docs/content/overview/packaging.md b/IdentityServer/v7/docs/content/overview/packaging.md
index 9ec2fb2b8..596568802 100644
--- a/IdentityServer/v7/docs/content/overview/packaging.md
+++ b/IdentityServer/v7/docs/content/overview/packaging.md
@@ -19,14 +19,21 @@ as a starting point for your modifications.
 ### Templates
 Contains templates for the dotnet CLI.
 
-* NuGet [package](https://www.nuget.org/packages/Duende.IdentityServer.Templates)
-* [source code](https://github.com/DuendeSoftware/IdentityServer.Templates)
+* NuGet [package](https://www.nuget.org/packages/Duende.Templates)
+* [source code](https://github.com/DuendeSoftware/products/tree/main/templates)
 
 You can install the templates using the following command:
 
 ```
-dotnet new -i Duende.IdentityServer.Templates
+dotnet new -i Duende.Templates
 ```
 
+{{% notice note %}}
+You may have a previous version of Duende templates (*Duende.IdentityServer.Templates*) installed on your machine. 
+Please uninstall the template package and install the latest version.
+{{% /notice %}}
+
 ### Source Code
-You can find the Duende IdentityServer source code on [GitHub](https://github.com/duendesoftware/IdentityServer).
+You can find the Duende IdentityServer source code on [GitHub][source].
+
+[source]: https://github.com/DuendeSoftware/products/tree/main/templates
diff --git a/IdentityServer/v7/docs/content/quickstarts/0_overview.md b/IdentityServer/v7/docs/content/quickstarts/0_overview.md
index 4db228521..efd75f377 100644
--- a/IdentityServer/v7/docs/content/quickstarts/0_overview.md
+++ b/IdentityServer/v7/docs/content/quickstarts/0_overview.md
@@ -20,9 +20,15 @@ Every quickstart has a reference solution - you can find the code in the [sample
 The first thing you should do is install our templates:
 
 ```
-dotnet new install Duende.IdentityServer.Templates
+dotnet new install Duende.Templates
 ```
 
+{{% notice note %}}
+You may have a previous version of Duende templates (*Duende.IdentityServer.Templates*) installed on your machine.
+Please uninstall the template package and install the latest version.
+{{% /notice %}}
+
+
 They will be used as a starting point for the various tutorials.
 
 {{< youtube cxYmODQHErM >}}
diff --git a/IdentityServer/v7/docs/content/quickstarts/1_client_credentials.md b/IdentityServer/v7/docs/content/quickstarts/1_client_credentials.md
index 07f932fe5..21dbfe1aa 100644
--- a/IdentityServer/v7/docs/content/quickstarts/1_client_credentials.md
+++ b/IdentityServer/v7/docs/content/quickstarts/1_client_credentials.md
@@ -37,9 +37,14 @@ the quickstarts. To install the templates open a console window and type the
 following command:
 
 ```console
-dotnet new install Duende.IdentityServer.Templates
+dotnet new install Duende.Templates
 ```
 
+{{% notice note %}}
+You may have a previous version of Duende templates (*Duende.IdentityServer.Templates*) installed on your machine.
+Please uninstall the template package and install the latest version.
+{{% /notice %}}
+
 ## Create the Solution and IdentityServer Project
 
 In this section, you will create a directory for the solution and use the