diff --git a/docs/developer/system/architecture.md b/docs/developer/system/architecture.md
index 196997f2f..8ca2692ab 100644
--- a/docs/developer/system/architecture.md
+++ b/docs/developer/system/architecture.md
@@ -82,20 +82,20 @@ The microservices responsible for satisfying the user requirements are:
 If you are interested, please take a look at
 the [C4 architectural diagram](C4-L2_diagram.png).
 
-A mapping of the architectural components to related pages in
-the documentation is available in the table.
+A mapping of the architectural components to the implementation
+components is available in the table.
 
 | System Component  | Doc Page(s)                                                                                                                             |
 | :---------------- | :--------------------------------------------------------------------------------------------------------------------------------------- |
-| Service Router           | [Traefik Gateway](https://github.com/INTO-CPS-Association/DTaaS/tree/feature/distributed-demo/servers/config/gateway#the-gateway-server) |
-| Web Application | [React Webapplication](../client/client.md)                                                                                              |
-| Reusable Assets   | [Library Microservice](../servers/lib/lib-ms.md)                                                                                         |
-| Digital Twins and DevOps   | [Integrated Gitlab](../../admin/gitlab/index.md)                                                                                         |
-| Services              | [Third-party Services](./../../admin/services.md) (MQTT, InfluxDB, RabbitMQ, Grafana and MongoDB)                                                       |
-| DT Lifecycle      | Not available yet                                                                                      |
-| Security          | Gitlab [client OAuth](../../admin/client/auth.md) and [server OAuth](../../admin/servers/auth.md)                                                                                               |
-| Digital Twins as Services | [DT Runner](../../user/servers/execution/runner/README.md)                                                                          |
-| Accounting        | Not available yet                                                                                                                                     |
+| Service Router           | [Traefik Gateway](https://doc.traefik.io/traefik/) |
+| Web Application | [React Webapplication](https://github.com/INTO-CPS-Association/DTaaS/blob/feature/distributed-demo/client/README.md)                       |
+| Reusable Assets   | [Library Microservice](https://github.com/INTO-CPS-Association/DTaaS/blob/feature/distributed-demo/servers/lib/README.md)                |
+| Digital Twins and DevOps   | [Integrated Gitlab](../../admin/gitlab/index.md)                                                                                |
+| Services              | [Third-party Services](./../../admin/services.md) (MQTT, InfluxDB, RabbitMQ, Grafana and MongoDB)                                    |
+| DT Lifecycle      | Not available yet                                                                                                                        |
+| Security          | Gitlab [client OAuth](../../admin/client/auth.md) and [server OAuth](../../admin/servers/auth.md)                                        |
+| Digital Twins as Services | [DT Runner](https://github.com/INTO-CPS-Association/DTaaS/blob/feature/distributed-demo/servers/execution/runner/README.md)      |
+| Accounting        | Not available yet                                                                                                                        |
 | Execution Manager | Not available yet                                                                                                                        |
 
 ## References
diff --git a/docs/developer/system/current-status.md b/docs/developer/system/current-status.md
index 47e4e7740..d96c5932c 100644
--- a/docs/developer/system/current-status.md
+++ b/docs/developer/system/current-status.md
@@ -37,7 +37,7 @@ also gets access to shared DT assets. Users can synchronize their
 private DT assets with external git repositories. In addition,
 the asset repository transparently gets mapped to user workspaces
 within which users can perform DT lifecycle operations.
-There is also a [library microservice](../servers/lib/lib-ms.md) which
+There is also a [library microservice](../../admin/servers/lib/npm.md) which
 in the long-run will replace the file server.
 
 Users can run DTs in their workspaces and also permit remote access