diff --git a/docs/working-model/release-management/planning/feature-proposal-creation-approval.md b/docs/working-model/release-management/planning/feature-proposal-creation-approval.md
index 0f1f6459..5a74fd67 100644
--- a/docs/working-model/release-management/planning/feature-proposal-creation-approval.md
+++ b/docs/working-model/release-management/planning/feature-proposal-creation-approval.md
@@ -7,7 +7,7 @@ title: Feature proposal creation
 
 1. **Create new feature proposal**: Anybody can contribute to a use case by [creating a feature proposal](https://github.com/eclipse-tractusx/sig-release/issues/new/choose) in Tractus X. The person creating the feature proposal is the 'Feature Author' and is going to be responsbile for the feature proposal through the process. The feature author has to continuously refine the feature until it contains the minimal feature content, so that it can be validated. This step might be obsolete if all information are added when creating the feature proposal.
 2. **Check strategic fit**: Once the feature proposal contains at least the minimal feature content, its strategic fit is going to be evaluated by the topic owner (either a committee or an expert group). If:
-   - the feature proposal strategically fits the status is going to be set to *Inbox*.
+   - the feature proposal strategically fits the status is going to be set to _Inbox_.
    - if the topic owner assess the feature proposal as not fitting the strategy, the feature proposal is going to be rejected. In this case the feature proposal is not going to be implemented.
 
 ## Deadline
diff --git a/docs/working-model/testmanagement/testmanagement.md b/docs/working-model/testmanagement/testmanagement.md
index afc0f6cd..c12d323a 100644
--- a/docs/working-model/testmanagement/testmanagement.md
+++ b/docs/working-model/testmanagement/testmanagement.md
@@ -1,5 +1,29 @@
 # Test Management
 
+<!-- TOC -->
+* [Test Management](#test-management)
+  * [Overview](#overview)
+  * [Tools](#tools)
+    * [Argo CD](#argo-cd)
+    * [Vault](#vault)
+    * [Grafana](#grafana)
+    * [Goldilocks](#goldilocks)
+    * [Xray](#xray)
+  * [Processes](#processes)
+    * [Test Cases in Xray](#test-cases-in-xray)
+    * [Deployment of Specific Versions in Argo CD](#deployment-of-specific-versions-in-argo-cd)
+  * [Dependencies](#dependencies)
+    * [Internal Dependencies](#internal-dependencies)
+    * [External Dependencies](#external-dependencies)
+  * [Conclusion](#conclusion)
+  * [Test Management old](#test-management-old)
+    * [Product Tests](#product-tests)
+    * [Release Tests](#release-tests)
+    * [Test Beds](#test-beds)
+    * [Defect Management](#defect-management)
+    * [Test Artifacts](#test-artifacts)
+<!-- TOC -->
+
 ## Overview
 
 Test management involves the planning, execution, and monitoring of testing activities to ensure the quality and functionality of software products. This document outlines the tools and processes involved in our test management strategy.
@@ -9,14 +33,37 @@ Test management involves the planning, execution, and monitoring of testing acti
 ### Argo CD
 
 - **Purpose:** Continuous delivery tool for Kubernetes.
-- **Usage:** Deployment of specific versions of products.
+- **Usage:** https://argocd.int.catena-x.net
 - **Features:**
-  - Automated deployments.
-  - Version control of deployments.
-  - Rollbacks to previous versions.
+  - Automated deployments
+  - Version control of deployments
+  - Rollbacks to previous versions
 
-### Infrastructure Maintenance
+### Vault
+
+- **Purpose:** Store secrets for deployment configurations.
+- **Usage:** https://vault.core.catena-x.net
+- **Features:**
+  - Secret management
+  - Usable in Argo CD with Argo-Vault Plugin
+
+### Grafana
 
+- **Purpose:** Monitoring of resources of the product teams
+- **Usage:** https://grafana.int.catena-x.net
+- **Features:**
+  - Dashboards for monitoring
+  - Alerting
+
+### Goldilocks
+
+- **Purpose:** Resource usage recommendations for the product teams
+- **Usage:** https://goldilocks.int.catena-x.net
+- **Features:**
+  - Resource recommendations
+  - Cost savings if applied by the product teams
+ 
+### Infrastructure Maintenance
 - **INT-Environment:** last Sunday of each month -> Products should check their deployments after downtime
 
 ### Xray
@@ -24,9 +71,9 @@ Test management involves the planning, execution, and monitoring of testing acti
 - **Purpose:** Test management tool integrated with Jira.
 - **Usage:** Managing test cases.
 - **Features:**
-  - Creation and execution of test cases.
-  - Test coverage reporting.
-  - Integration with CI/CD pipelines.
+  - Creation and execution of test cases
+  - Test coverage reporting
+  - Integration with CI/CD pipelines
 
 ## Processes