diff --git a/MODULE.bazel b/MODULE.bazel
index 7b52f279..36fa7bee 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,7 +14,7 @@ module(
     name = "cpp_rust_template_repository",
 )
 
-bazel_dep(name = "rules_python", version = "1.8.3", dev_dependency = True)
+bazel_dep(name = "rules_python", version = "1.8.5", dev_dependency = True)
 
 # Python 3.12: Required for testing infrastructure and code generation tools
 PYTHON_VERSION = "3.12"
@@ -75,7 +75,7 @@ bazel_dep(name = "aspect_rules_lint", version = "1.10.2", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2", dev_dependency = True)
 
 #docs-as-code
-bazel_dep(name = "score_docs_as_code", version = "5.0.0", dev_dependency = True)
+bazel_dep(name = "score_docs_as_code", version = "6.0.0", dev_dependency = True)
 bazel_dep(name = "score_process", version = "2.0.2", dev_dependency = True)
 
 # grpc-java 1.66.0 imports a grpc extension repo removed in newer grpc versions.
@@ -84,10 +84,3 @@ single_version_override(
     module_name = "grpc-java",
     version = "1.70.0",
 )
-
-# Use latest main, not released yet.
-git_override(
-    module_name = "score_docs_as_code",
-    commit = "98a078b323fde35fa86d42dc67d75c558ed6c9a8",
-    remote = "https://github.com/eclipse-score/docs-as-code.git",
-)
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 1478d1af..9353b513 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -715,8 +715,16 @@
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.7.0/MODULE.bazel": "f9a5971fbd05f0ed14e7a373dbf58af72a5c58d081537a75c314daaf61c92ae9",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.9.0/MODULE.bazel": "2a04a354eb7a77d478bb43ba20b1dac0758af858172a760e4290621bef1a2f28",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.9.0/source.json": "6f72c780f1fb167be7cbc01801b86534a9e7102003168dcdf2c8886cfb1bb209",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_docs_as_code/4.5.0/MODULE.bazel": "4cfe52fe8b8dbeaf7e87500036391da278f72f1c2b41b689ffdd4337196dd8fe",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_docs_as_code/4.6.0/MODULE.bazel": "d5fbfed7b9bd65f10830e2290045dea639a8cfcaf9f9f0f7a1b12888c14e7d2b",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_docs_as_code/4.6.1/MODULE.bazel": "0dae734ea8a99970a7417829b3115af02717b29f0fc40a8ebd3c1afcc71e1e21",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_docs_as_code/6.0.0/MODULE.bazel": "ab2af2d8fab73e4512d2e2bd399a64d10c5c5463388322f7025637b13ec7585c",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_docs_as_code/6.0.0/source.json": "c3992257800c4e3408be5e4656c0903fc19d3933011cc58e85d9a29c7214f374",
+    "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/1.6.0/MODULE.bazel": "2496bc24311f69f49449ee85d8bb38e3b970cbfcf10d0a7f19b2d5262ce80e8d",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.1/MODULE.bazel": "88bff0ed46da79d87f8c441a6bf6b760ee7c194b282e7e54a8b7db6ea2354db9",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.2/MODULE.bazel": "6d2b227bb6880e9f6871cc8cf94c83399e35c188424f7e9b826262de8149ed43",
     "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.2/source.json": "5ae55f0dabcddeb5bfae16ce480e2c065f907d2b0ed6a8e4ed7409b259b004ee",
diff --git a/examples/docs/architecture_modeling_example.rst b/examples/docs/architecture_modeling_example.rst
index 460bda2f..ffd7a96a 100644
--- a/examples/docs/architecture_modeling_example.rst
+++ b/examples/docs/architecture_modeling_example.rst
@@ -30,7 +30,6 @@ Feature Architecture File
    :safety: QM
    :status: valid
    :version: 1
-   :includes: logic_arc_int__example_feature__if_1, logic_arc_int__example_feature__if_2, logic_arc_int__example_feature__if_3
 
    This is the example feature which shall normally defined in the platform repo.
 
@@ -58,6 +57,7 @@ Feature Architecture File
    :safety: ASIL_B
    :status: valid
    :version: 1
+   :included_by: feat__mtef
    :fulfils: feat_req__example_feature__example_req
 
    .. needarch::
@@ -73,6 +73,7 @@ Feature Architecture File
    :safety: ASIL_B
    :status: valid
    :version: 1
+   :included_by: feat__mtef
    :fulfils: feat_req__example_feature__example_req
 
    .. needarch::
@@ -88,6 +89,7 @@ Feature Architecture File
    :safety: ASIL_B
    :status: valid
    :version: 1
+   :included_by: feat__mtef
    :fulfils: feat_req__example_feature__example_req