diff --git a/docs/en/guides/add-module-to-microservice.md b/docs/en/guides/add-module-to-microservice.md
index 24882df751..1c5725bafd 100644
--- a/docs/en/guides/add-module-to-microservice.md
+++ b/docs/en/guides/add-module-to-microservice.md
@@ -47,7 +47,7 @@ abp generate-proxy --type csharp --module cms-kit --url https://localhost:44335
 
 > Note: This port is used by `Public-Web`. You can check your port from `launchSetting.json`. The Public Web calls the Public Web Gateway so it has called the related services and has generated proxy files. [For more](https://abp.io/docs/latest/solution-templates/microservice/api-gateways) 
 
-> If you have generated a new microservice with the ABP CLI by following the [add new microservice guide](https://abp.io/docs/commercial/8.1/startup-templates/microservice/add-microservice), it should already be configured to use the static proxy.
+> If you have generated a new microservice with the ABP CLI by following the [add new microservice guide](https://abp.io/docs/latest/solution-templates/microservice/adding-new-microservices), it should already be configured to use the static proxy.
 
 ## Configure Gateways
 The microservice template project has two gateway projects.
diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
index 3e608ae19f..3a14def7a2 100644
--- a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
+++ b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
@@ -58,7 +58,7 @@
                 description: 'See the example projects built with the ABP Framework.',
                 links: [
                   {
-                    href: 'https://abp.io/docs/latest/Samples/Index?ref=tmpl',
+                    href: 'https://abp.io/docs/latest/samples?ref=tmpl',
                     label: 'All samples'
                   }
                 ]
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
index 523f1a7dca..09c2fa51e6 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
@@ -65,7 +65,7 @@
                     <div class="p-4">
                         <h5 class="mb-3"><i class="fas fa-cubes text-secondary d-block my-3 fa-2x"></i> Samples</h5>
                         <p>See the example projects built with the ABP Framework.</p>
-                        <a href="https://abp.io/docs/latest/Samples/Index?ref=tmpl" target="_blank" class="btn btn-link px-1">All samples <i class="fas fa-chevron-right"></i></a>
+                        <a href="https://abp.io/docs/latest/samples?ref=tmpl" target="_blank" class="btn btn-link px-1">All samples <i class="fas fa-chevron-right"></i></a>
                     </div>
                 </div>
                 <div class="col-lg-4 border-start">
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
index d4ad304e2e..1c271cb5fd 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
@@ -68,7 +68,7 @@
                     <div class="p-4">
                         <h5 class="mb-3"><i class="fas fa-cubes text-secondary d-block my-3 fa-2x"></i> Samples</h5>
                         <p>See the example projects built with the ABP Framework.</p>
-                        <a href="https://abp.io/docs/latest/Samples/Index?ref=tmpl" target="_blank" class="btn btn-link px-1">All samples <i class="fas fa-chevron-right"></i></a>
+                        <a href="https://abp.io/docs/latest/samples?ref=tmpl" target="_blank" class="btn btn-link px-1">All samples <i class="fas fa-chevron-right"></i></a>
                     </div>
                 </div>
                 <div class="col-lg-4 border-start">