diff --git a/docs/design_decisions/DR-003-strat.md b/docs/design_decisions/DR-003-strat.md
index 219c18f5c5b..bf80f32a990 100644
--- a/docs/design_decisions/DR-003-strat.md
+++ b/docs/design_decisions/DR-003-strat.md
@@ -20,6 +20,7 @@ SPDX-License-Identifier: Apache-2.0
 :status: proposed
 :context: Strategy
 :decision: Classify every module into one of three maturity levels — Release, Experimental, or Preview — based on requirement coverage and S-CORE process artifact completeness.
+:version: 1
 ```
 
 ---
diff --git a/docs/features/baselibs/docs/architecture/index.rst b/docs/features/baselibs/docs/architecture/index.rst
index 743a2514b23..0903d844446 100644
--- a/docs/features/baselibs/docs/architecture/index.rst
+++ b/docs/features/baselibs/docs/architecture/index.rst
@@ -249,3 +249,6 @@ Interfaces
    :safety: ASIL_B
    :status: valid
    :version: 1
+
+.. needextend:: "c.this_doc()"
+   :+tags: baselibs
diff --git a/docs/features/baselibs/docs/requirements/chklst_req_inspection.rst b/docs/features/baselibs/docs/requirements/chklst_req_inspection.rst
index dba15f5fd19..8e741a66335 100644
--- a/docs/features/baselibs/docs/requirements/chklst_req_inspection.rst
+++ b/docs/features/baselibs/docs/requirements/chklst_req_inspection.rst
@@ -20,6 +20,7 @@
    :safety: ASIL_B
    :security: YES
    :realizes: wp__requirements_inspect[version==1]
+   :tags: baselibs
 
 
 Requirement Inspection Checklist
diff --git a/docs/features/baselibs/docs/requirements/index.rst b/docs/features/baselibs/docs/requirements/index.rst
index a4adb194576..9e463fd08b4 100644
--- a/docs/features/baselibs/docs/requirements/index.rst
+++ b/docs/features/baselibs/docs/requirements/index.rst
@@ -222,5 +222,5 @@ Requirements
    calculation (e.g. SHA-256, SHA-512) and checksum algorithms (e.g. CRC-32) over
    byte data and streams via a pluggable interface.
 
-.. needextend:: is_external == False and "__baselibs" in id
+.. needextend:: "c.this_doc()"
    :+tags: baselibs
diff --git a/docs/features/baselibs/index.rst b/docs/features/baselibs/index.rst
index 76a1e19f253..9cf1905434c 100644
--- a/docs/features/baselibs/index.rst
+++ b/docs/features/baselibs/index.rst
@@ -22,7 +22,7 @@ Base Libraries
    :status: valid
    :version: 1
    :safety: ASIL_B
-   :tags: feature_request
+   :tags: feature_request, baselibs
    :security: YES
    :realizes: wp__feat_request[version==1]
 
diff --git a/docs/modules/orchestrator/executor/docs/requirements/index.rst b/docs/modules/orchestrator/executor/docs/requirements/index.rst
index 03acae50026..effaaefe980 100644
--- a/docs/modules/orchestrator/executor/docs/requirements/index.rst
+++ b/docs/modules/orchestrator/executor/docs/requirements/index.rst
@@ -62,6 +62,3 @@ Requirements
     - Replace the example content by the real content for your first requirement (according to :need:`gd_guidl__req_engineering`)
     - Set the status to valid and start the review/merge process
     - Add other needed requirements for your feature
-
-.. needextend:: "component_name" in id and is_external == False
-   :+tags: component_name
diff --git a/docs/modules/orchestrator/orchestrator/docs/requirements/index.rst b/docs/modules/orchestrator/orchestrator/docs/requirements/index.rst
index 16d299065dc..07d92921d7c 100644
--- a/docs/modules/orchestrator/orchestrator/docs/requirements/index.rst
+++ b/docs/modules/orchestrator/orchestrator/docs/requirements/index.rst
@@ -62,6 +62,3 @@ Requirements
     - Replace the example content by the real content for your first requirement (according to :need:`gd_guidl__req_engineering`)
     - Set the status to valid and start the review/merge process
     - Add other needed requirements for your feature
-
-.. needextend:: "component_name" in id and is_external == False
-   :+tags: component_name