diff --git a/process/process_areas/process_management/guidance/process_management_guideline.rst b/process/process_areas/process_management/guidance/process_management_guideline.rst
index 867f6fca77..22dbdad21d 100644
--- a/process/process_areas/process_management/guidance/process_management_guideline.rst
+++ b/process/process_areas/process_management/guidance/process_management_guideline.rst
@@ -20,7 +20,9 @@ Guideline
    :id: gd_guidl__process_management
    :status: valid
    :tags: process_management
-   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__iso26262__management_5426, std_req__aspice_40__gp-311, std_req__aspice_40__iic-10-00, std_req__aspice_40__iic-15-54
+   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__iso26262__management_5426, std_req__aspice_40__gp-311, std_req__aspice_40__iic-10-00, std_req__aspice_40__iic-15-54,
+              std_req__aspice_40__gp-211, std_req__aspice_40__gp-212, std_req__aspice_40__gp-213, std_req__aspice_40__gp-214, std_req__aspice_40__gp-215, std_req__aspice_40__gp-216, std_req__aspice_40__gp-224,
+              std_req__aspice_40__gp-312, std_req__aspice_40__gp-313, std_req__aspice_40__gp-314, std_req__aspice_40__gp-321, std_req__aspice_40__gp-322, std_req__aspice_40__gp-323, std_req__aspice_40__gp-324
 
 This document describes the general guidances for Process Management based on the concept which is defined :need:`[[title]]<doc_concept__process_management>`.
 
diff --git a/process/process_areas/process_management/guidance/process_management_templates.rst b/process/process_areas/process_management/guidance/process_management_templates.rst
index 1514117a9b..8235ffd31c 100644
--- a/process/process_areas/process_management/guidance/process_management_templates.rst
+++ b/process/process_areas/process_management/guidance/process_management_templates.rst
@@ -197,7 +197,7 @@ Templates
    :id: gd_temp__process_standard_wp
    :status: valid
    :tags: process_management
-   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__aspice_40__gp-311
+   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__aspice_40__gp-311, std_req__aspice_40__gp-221, std_req__aspice_40__gp-222, std_req__aspice_40__gp-223
 
    .. code-block:: rst
 
@@ -211,7 +211,7 @@ Templates
    :id: gd_temp__process_document
    :status: valid
    :tags: process_management
-   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__aspice_40__gp-311
+   :complies: std_req__iso26262__management_5421, std_req__iso26262__management_5422, std_req__aspice_40__gp-311, std_req__aspice_40__gp-221, std_req__aspice_40__gp-222, std_req__aspice_40__gp-223
 
    .. code-block:: rst
 
diff --git a/process/standards/aspice_40/aspice.rst b/process/standards/aspice_40/aspice.rst
index 8caa666d6b..83040b6056 100644
--- a/process/standards/aspice_40/aspice.rst
+++ b/process/standards/aspice_40/aspice.rst
@@ -60,6 +60,7 @@ Tailoring
 |   - MAN: MAN.6 - Measurements (not applicable for now)
 |   - VAL: Validation process group (pure SW with no (automobile) user interaction)
 |   - ACQ: Acquisition process group (because there is no contracted supplier of the project)
+|   - Process capability level 4 and 5 (GP4 and GP5)
 
 
 .. toctree::
@@ -420,7 +421,7 @@ Generic practices
       For guidance on how to perform process improvements see the Process Improvement process (PIM.3).
 
 .. needextend:: "c.this_doc()"
-   :+tags: aspice40_gp3
+   :+tags: aspice40_gp2_gp3
 
 Appendix
 --------