diff --git a/en/studio/solution-templates/microservice/api-gateways.md b/en/studio/solution-templates/microservice/api-gateways.md
index b79cf102..0f798e5d 100644
--- a/en/studio/solution-templates/microservice/api-gateways.md
+++ b/en/studio/solution-templates/microservice/api-gateways.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution: API Gateways
+# Microservice Solution: API Gateways
 
 An API Gateway is used to expose your system to the clients. It also provides a single entry point to your system.
 
diff --git a/en/studio/solution-templates/microservice/authentication.md b/en/studio/solution-templates/microservice/authentication.md
new file mode 100644
index 00000000..08045ca6
--- /dev/null
+++ b/en/studio/solution-templates/microservice/authentication.md
@@ -0,0 +1,3 @@
+# Microservice Solution: Authentication
+
+*TODO*
\ No newline at end of file
diff --git a/en/studio/solution-templates/microservice/database-migrations.md b/en/studio/solution-templates/microservice/database-migrations.md
new file mode 100644
index 00000000..33fac7f7
--- /dev/null
+++ b/en/studio/solution-templates/microservice/database-migrations.md
@@ -0,0 +1,3 @@
+# Microservice Solution: Database Migrations
+
+*TODO*
\ No newline at end of file
diff --git a/en/studio/solution-templates/microservice/index.md b/en/studio/solution-templates/microservice/index.md
index 87cd31df..734ad39a 100644
--- a/en/studio/solution-templates/microservice/index.md
+++ b/en/studio/solution-templates/microservice/index.md
@@ -18,11 +18,11 @@ ABP Studio provides pre-architected and production-ready templates to jump start
   * [Web Applications](web-applications.md)
   * [Mobile Applications](mobile-applications.md)
 * Built-In Features
-  * Authentication
-  * Database migrations
+  * [Authentication](authentication.md)
+  * [Database migrations](database-migrations.md)
   * Logging (with Serilog)
   * Monitoring (with Prometheus and Grafana)
-  * Swagger Integration
+  * Swagger integration
   * Permission management
   * Feature management
   * Localization system
diff --git a/en/studio/solution-templates/microservice/main-components.md b/en/studio/solution-templates/microservice/main-components.md
index 7684126c..8f4a2fd9 100644
--- a/en/studio/solution-templates/microservice/main-components.md
+++ b/en/studio/solution-templates/microservice/main-components.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution: Main Components
+# Microservice Solution: Main Components
 
 The solution consists of various applications, API gateways and services. The following documents explains these components in details:
 
diff --git a/en/studio/solution-templates/microservice/microservices.md b/en/studio/solution-templates/microservice/microservices.md
index dbd1d7c8..dca8c5d4 100644
--- a/en/studio/solution-templates/microservice/microservices.md
+++ b/en/studio/solution-templates/microservice/microservices.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution: Microservices
+# Microservice Solution: The Microservices
 
 The ABP Studio Microservice solution consists of a few microservices at the beginning. It is expected that you [add more microservices](guides/add-new-microservice.md) as your solution grows. This document briefly explains the structure of pre-built microservices in the solution.
 
diff --git a/en/studio/solution-templates/microservice/mobile-applications.md b/en/studio/solution-templates/microservice/mobile-applications.md
index 06d4fe1b..02ad99b1 100644
--- a/en/studio/solution-templates/microservice/mobile-applications.md
+++ b/en/studio/solution-templates/microservice/mobile-applications.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution: Mobile Applications
+# Microservice Solution: Mobile Applications
 
 The ABP Studio microservice solution template comes with an optional mobile application that is completely integrated to the solution. There are two options for the mobile application:
 
diff --git a/en/studio/solution-templates/microservice/overview.md b/en/studio/solution-templates/microservice/overview.md
index 170a47ee..dd03dff0 100644
--- a/en/studio/solution-templates/microservice/overview.md
+++ b/en/studio/solution-templates/microservice/overview.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution Template Overview
+# Microservice Solution: Overview
 
 In this document, you will learn what the Microservice solution template offers to you.
 
diff --git a/en/studio/solution-templates/microservice/solution-structure.md b/en/studio/solution-templates/microservice/solution-structure.md
index 55e06f9b..4b4f4f46 100644
--- a/en/studio/solution-templates/microservice/solution-structure.md
+++ b/en/studio/solution-templates/microservice/solution-structure.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution Structure
+# Microservice Solution: The Structure
 
 This document explains the solution and folder structure of ABP Studio's [microservice solution template](index.md).
 
diff --git a/en/studio/solution-templates/microservice/web-applications.md b/en/studio/solution-templates/microservice/web-applications.md
index 1d49e4c5..4f72a8b6 100644
--- a/en/studio/solution-templates/microservice/web-applications.md
+++ b/en/studio/solution-templates/microservice/web-applications.md
@@ -1,4 +1,4 @@
-# ABP Studio Microservice Solution: Web Applications
+# Microservice Solution: Web Applications
 
 The ABP Studio microservice solution template contains a few web applications. These applications are fully integrated to the solution, uses the [microservices](microservices.md) through the [API gateways](api-gateways.md).