diff --git a/docs/en/Startup-Templates/Application.md b/docs/en/Startup-Templates/Application.md
index ec89f479ab..6a47363e8c 100644
--- a/docs/en/Startup-Templates/Application.md
+++ b/docs/en/Startup-Templates/Application.md
@@ -78,7 +78,7 @@ Based on the options you've specified, you will get a slightly different solutio
 
 If you don't specify any additional options, you will have a solution as shown below:
 
-![bookstore-visual-studio-solution-v3](../images/bookstore-visual-studio-solution-v3.png)
+![bookstore-rider-solution-v6](../images/solution-structure-solution-explorer-rider.png)
 
 Projects are organized in `src` and `test` folders. `src` folder contains the actual application which is layered based on [DDD](../Domain-Driven-Design.md) principles as mentioned before.
 
@@ -225,7 +225,7 @@ So, the resulting solution allows a 4-tiered deployment, by comparing to 3-tiere
 
 The solution structure is shown below:
 
-![bookstore-visual-studio-solution-v3](../images/bookstore-visual-studio-solution-tiered.png)
+![bookstore-rider-solution-v6](../images/bookstore-rider-solution-tiered.png)
 
 As different from the default structure, two new projects come into play: `.AuthServer` & `.HttpApi.Host`.
 
@@ -233,9 +233,9 @@ As different from the default structure, two new projects come into play: `.Auth
 
 This project is used as an authentication server for other projects. `.Web` project uses OpenId Connect Authentication to get identity and access tokens for the current user from the AuthServer. Then uses the access token to call the HTTP API server. HTTP API server uses bearer token authentication to obtain claims from the access token to authorize the current user.
 
-![tiered-solution-applications](../images/tiered-solution-applications.png)
+![tiered-solution-applications](../images/tiered-solution-applications-authserver.png)
 
-ABP uses the open source [OpenIddcit](https://github.com/openiddict/openiddict-core) framework for the authentication between applications. See [OpenIddcit documentation](https://documentation.openiddict.com/) for details about the OpenIddict and OpenID Connect protocol.
+ABP uses the [OpenIddict Module](../Modules/OpenIddict.md) that uses the open-source [OpenIddict-core](https://github.com/openiddict/openiddict-core) library for the authentication between applications. See [OpenIddict documentation](https://documentation.openiddict.com/) for details about the OpenIddict and OpenID Connect protocol.
 
 It has its own `appsettings.json` that contains database connection and other configurations.
 
diff --git a/docs/en/images/bookstore-rider-solution-tiered.png b/docs/en/images/bookstore-rider-solution-tiered.png
new file mode 100644
index 0000000000..25114bc51c
Binary files /dev/null and b/docs/en/images/bookstore-rider-solution-tiered.png differ
diff --git a/docs/en/images/solution-structure-solution-explorer-rider.png b/docs/en/images/solution-structure-solution-explorer-rider.png
new file mode 100644
index 0000000000..8a09cec74e
Binary files /dev/null and b/docs/en/images/solution-structure-solution-explorer-rider.png differ
diff --git a/docs/en/images/tiered-solution-applications-authserver.png b/docs/en/images/tiered-solution-applications-authserver.png
new file mode 100644
index 0000000000..6d96bf31b4
Binary files /dev/null and b/docs/en/images/tiered-solution-applications-authserver.png differ