diff --git a/BUILD b/BUILD
index f837d61e27e..57ad428c714 100644
--- a/BUILD
+++ b/BUILD
@@ -62,6 +62,60 @@ setup_starpls(
 )
 
 docs(
+    bundles = [
+        {
+            "bundle": "//docs/features/ai_platform:docs",
+            "mount_at": "features/ai_platform",
+        },
+        {
+            "bundle": "//docs/features/baselibs:docs",
+            "mount_at": "features/baselibs",
+        },
+        {
+            "bundle": "//docs/features/code_generation:docs",
+            "mount_at": "features/code_generation",
+        },
+        {
+            "bundle": "//docs/features/communication:docs",
+            "mount_at": "features/communication",
+        },
+        {
+            "bundle": "//docs/features/configuration:docs",
+            "mount_at": "features/configuration",
+        },
+        {
+            "bundle": "//docs/features/diagnostics:docs",
+            "mount_at": "features/diagnostics",
+        },
+        {
+            "bundle": "//docs/features/frameworks:docs",
+            "mount_at": "features/frameworks",
+        },
+        {
+            "bundle": "//docs/features/lifecycle:docs",
+            "mount_at": "features/lifecycle",
+        },
+        {
+            "bundle": "//docs/features/log_and_trace:docs",
+            "mount_at": "features/log_and_trace",
+        },
+        {
+            "bundle": "//docs/features/orchestration:docs",
+            "mount_at": "features/orchestration",
+        },
+        {
+            "bundle": "//docs/features/persistency:docs",
+            "mount_at": "features/persistency",
+        },
+        {
+            "bundle": "//docs/features/security_crypto:docs",
+            "mount_at": "features/security_crypto",
+        },
+        {
+            "bundle": "//docs/features/time:docs",
+            "mount_at": "features/time",
+        },
+    ],
     data = [
         "@score_process_description//:needs_json",
     ],
diff --git a/docs/conf.py b/docs/conf.py
index 663c3d82fc1..dbbee076b33 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,6 +25,13 @@
     "score_sphinx_bundle",
 ]
 
+# Feature documentation is provided by one Bazel bundle per feature and mounted
+# below ``features/``. Keep the live workspace sources out of the host
+# project's discovery so they are not registered twice by Sphinx.
+exclude_patterns = [
+    "features/*/**",
+]
+
 # Serve files from docs/_assets and load our own CSS overrides last so they win
 # over the styles shipped by the score_docs_as_code bundle.
 html_static_path = ["_assets"]
diff --git a/docs/features/ai_platform/BUILD b/docs/features/ai_platform/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/ai_platform/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/baselibs/BUILD b/docs/features/baselibs/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/baselibs/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/code_generation/BUILD b/docs/features/code_generation/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/code_generation/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/communication/BUILD b/docs/features/communication/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/communication/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/configuration/BUILD b/docs/features/configuration/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/configuration/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/diagnostics/BUILD b/docs/features/diagnostics/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/diagnostics/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/frameworks/BUILD b/docs/features/frameworks/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/frameworks/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/index.rst b/docs/features/index.rst
index d4e2ca5f233..217c3eaab8d 100644
--- a/docs/features/index.rst
+++ b/docs/features/index.rst
@@ -28,11 +28,10 @@ For further explanation see the `Building blocks concept <https://eclipse-score.
 
 The following features are defined:
 
+.. note: toctree will be filled by bazel build system, do not edit manually
+
 .. toctree::
    :maxdepth: 1
-   :glob:
-
-   */index
 
 Feature List
 ------------
diff --git a/docs/features/lifecycle/BUILD b/docs/features/lifecycle/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/lifecycle/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/log_and_trace/BUILD b/docs/features/log_and_trace/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/log_and_trace/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/orchestration/BUILD b/docs/features/orchestration/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/orchestration/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/persistency/BUILD b/docs/features/persistency/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/persistency/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/security_crypto/BUILD b/docs/features/security_crypto/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/security_crypto/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)
diff --git a/docs/features/time/BUILD b/docs/features/time/BUILD
new file mode 100644
index 00000000000..ec7444253b2
--- /dev/null
+++ b/docs/features/time/BUILD
@@ -0,0 +1,7 @@
+load("@score_docs_as_code//:docs.bzl", "docs_bundle")
+
+docs_bundle(
+    name = "docs",
+    source_dir = ".",
+    visibility = ["//visibility:public"],
+)