diff --git a/MODULE.bazel b/MODULE.bazel
index 6500714ab2..d6f09a742d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -50,4 +50,16 @@ bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 ###############################################################################
 bazel_dep(name = "aspect_rules_lint", version = "1.5.3")
 bazel_dep(name = "score_tooling", version = "1.1.0")
-bazel_dep(name = "score_docs_as_code", version = "3.0.0")
+bazel_dep(name = "score_docs_as_code")
+
+git_override(
+    module_name = "score_tooling",
+    commit = "58581abf75b321defbb53ffbad3b65e7f62b5082",
+    remote = "https://github.com/etas-contrib/score_tooling.git",
+)
+
+git_override(
+    module_name = "score_docs_as_code",
+    commit = "21640ab325b3aae147ba4e3e8b5e7ab89fc2e8f5",
+    remote = "https://github.com/etas-contrib/score_docs-as-code.git",
+)
diff --git a/process/folder_templates/features/feature_name/architecture/index.rst b/process/folder_templates/features/feature_name/architecture/index.rst
index ab6abb5169..2f03ccf002 100644
--- a/process/folder_templates/features/feature_name/architecture/index.rst
+++ b/process/folder_templates/features/feature_name/architecture/index.rst
@@ -81,7 +81,6 @@ Static Architecture
    :safety: ASIL_B
    :status: invalid
    :includes: logic_arc_int__feature_name__interface_name1
-   :consists_of: comp__component_name_template
 
    General Feature Description
 
diff --git a/process/folder_templates/modules/module_name/component_name/docs/architecture/index.rst b/process/folder_templates/modules/module_name/component_name/docs/architecture/index.rst
index 23643a7cc7..285065d609 100644
--- a/process/folder_templates/modules/module_name/component_name/docs/architecture/index.rst
+++ b/process/folder_templates/modules/module_name/component_name/docs/architecture/index.rst
@@ -79,6 +79,7 @@ A component can optional also consist of subcomponents to further structure the
    :status: invalid
    :implements: logic_arc_int__feature_name__interface_name1
    :consists_of: comp__archex_sub_component_1, comp__archex_sub_component_2, comp__archex_sub_component_3
+   :belongs_to: feat__feature_name
 
 .. comp_arc_sta:: Component Name (Static View)
    :id: comp_arc_sta__component_name__static_view
diff --git a/process/process_areas/architecture_design/architecture_concept.rst b/process/process_areas/architecture_design/architecture_concept.rst
index ac4004b5d3..435b8cd7b3 100644
--- a/process/process_areas/architecture_design/architecture_concept.rst
+++ b/process/process_areas/architecture_design/architecture_concept.rst
@@ -489,7 +489,6 @@ The following section is an example, how an `Feature <https://eclipse-score.gith
    :safety: ASIL_B
    :status: invalid
    :includes: logic_arc_int__example_feature__archex_logical_interface_1
-   :consists_of: comp__component_example_1
 
 .. feat_arc_sta:: Feature Static Architecture View - Rendered Example
       :id: feat_arc_sta__example_feature__archdes_getstrt
diff --git a/process/process_areas/architecture_design/guidance/architecture_modeling_example.rst b/process/process_areas/architecture_design/guidance/architecture_modeling_example.rst
index d66574cb70..1d03a8bc0d 100644
--- a/process/process_areas/architecture_design/guidance/architecture_modeling_example.rst
+++ b/process/process_areas/architecture_design/guidance/architecture_modeling_example.rst
@@ -28,7 +28,6 @@ Feature Architecture File
    :safety: QM
    :status: valid
    :includes: logic_arc_int__example_feature__archex_logical_interface_1, logic_arc_int__example_feature__archex_logical_interface_2, logic_arc_int__example_feature__archex_logical_interface_3
-   :consists_of: comp__component_example_1
 
    This is the example feature.
 
@@ -195,6 +194,7 @@ Component Architecture File(s)
    :status: invalid
    :implements: logic_arc_int__example_feature__archex_logical_interface_1
    :consists_of: comp__archex_sub_component_1, comp__archex_sub_component_2, comp__archex_sub_component_3
+   :belongs_to: feat__example_feature
 
    Example Component 1 description.
 
@@ -204,6 +204,7 @@ Component Architecture File(s)
    :safety: ASIL_B
    :status: invalid
    :implements: logic_arc_int__example_feature__archex_logical_interface_2
+   :belongs_to: feat__example_feature
 
    Example Component 2 description.
 
@@ -213,6 +214,7 @@ Component Architecture File(s)
    :safety: QM
    :status: invalid
    :implements: logic_arc_int__example_feature__archex_logical_interface_3
+   :belongs_to: feat__example_feature
 
    Example Component 3 description.
 
@@ -239,6 +241,7 @@ Component Architecture File(s)
    :security: NO
    :uses: logic_arc_int__example_feature__archex_logical_interface_2
    :implements: logic_arc_int__example_feature__archex_logical_interface_1
+   :belongs_to: feat__example_feature
 
 .. comp:: Component 1_2
    :id: comp__archex_sub_component_2
@@ -247,12 +250,14 @@ Component Architecture File(s)
    :security: NO
    :uses: logic_arc_int__example_feature__archex_logical_interface_2
    :implements: logic_arc_int__example_feature__archex_logical_interface_2
+   :belongs_to: feat__example_feature
 
 .. comp:: Component 1_3
    :id: comp__archex_sub_component_3
    :status: valid
    :safety: ASIL_B
    :security: NO
+   :belongs_to: feat__example_feature
 
 Requirements for the Example
 =============================