diff --git a/docs/en/Samples/Index.md b/docs/en/Samples/Index.md
index 58543ba380..704cdf3808 100644
--- a/docs/en/Samples/Index.md
+++ b/docs/en/Samples/Index.md
@@ -2,15 +2,19 @@
 
 Here, a list of official samples built with the ABP Framework. Most of these samples are located under the [abpframework/abp-samples](https://github.com/abpframework/abp-samples) GitHub repository.
 
-### Microservice Demo
+## eShopOnAbp
 
-A complete solution to demonstrate how to build systems based on the microservice architecture.
+Reference microservice solution built with the ABP Framework and .NET.
 
-* [The complete documentation for this sample](Microservice-Demo.md)
-* [Source code](https://github.com/abpframework/abp-samples/tree/master/MicroserviceDemo)
-* [Microservice architecture document](../Microservice-Architecture.md)
+* [Source code](https://github.com/abpframework/eShopOnAbp)
 
-### Book Store
+## EventHub
+
+This is a reference application built with the ABP Framework. It implements the Domain Driven Design with multiple application layers.
+
+* [Source code](https://github.com/abpframework/eventhub)
+
+## Book Store
 
 A simple CRUD application to show basic principles of developing an application with the ABP Framework. The same sample was implemented with different technologies:
 
@@ -28,7 +32,7 @@ A simple CRUD application to show basic principles of developing an application
 
 While there is no Razor Pages & MongoDB combination, you can check both documents to understand it since DB & UI selection don't effect each other.
 
-### Other Samples
+## Other Samples
 
 * **Event Organizer**: A sample application to create events (meetups) and allow others to register the events. Developed using EF Core and Blazor UI.
   * [Source code](https://github.com/abpframework/abp-samples/tree/master/EventOrganizer)
diff --git a/docs/en/Samples/Microservice-Demo.md b/docs/en/Samples/Microservice-Demo.md
index 285c2b10a0..1e2549338f 100644
--- a/docs/en/Samples/Microservice-Demo.md
+++ b/docs/en/Samples/Microservice-Demo.md
@@ -1,5 +1,7 @@
 # Microservice Demo Solution
 
+> This solution is no longer maintained. See [the eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) for the replacement solution.
+
 *"Microservices are a software development technique—a variant of the **service-oriented architecture** (SOA) architectural style that structures an application as a collection of **loosely coupled services**. In a microservices architecture, services are **fine-grained** and the protocols are **lightweight**. The benefit of decomposing an application into different smaller services is that it improves **modularity**. This makes the application easier to understand, develop, test, and become more resilient to architecture erosion. It **parallelizes development** by enabling small autonomous teams to **develop, deploy and scale** their respective services independently. It also allows the architecture of an individual service to emerge through **continuous refactoring**. Microservices-based architectures enable **continuous delivery and deployment**."*
 
 — [Wikipedia](https://en.wikipedia.org/wiki/Microservices)
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index b81f0b6efd..ac76c7cee8 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -1300,7 +1300,15 @@
           "path": "Samples/Index.md"
         },
         {
-          "text": "Microservice Demo",
+          "text": "eShopOnAbp",
+          "path": "https://github.com/abpframework/eShopOnAbp"
+        },
+        {
+          "text": "EventHub",
+          "path": "https://github.com/abpframework/eventhub"
+        },
+        {
+          "text": "Microservice Demo (legacy)",
           "path": "Samples/Microservice-Demo.md"
         }
       ]