diff --git a/.github/workflows/test_and_docs.yml b/.github/workflows/test_and_docs.yml
index 6017213b8d7..022d9d7c858 100644
--- a/.github/workflows/test_and_docs.yml
+++ b/.github/workflows/test_and_docs.yml
@@ -112,7 +112,7 @@ jobs:
             --repo_contents_cache="/home/runner/.cache/bazel/repo_contents" \
             --repository_cache="/home/runner/.cache/bazel/repo" \
             --disk_cache="/home/runner/.cache/bazel/disk" \
-              //:docs_combo_experimental -- \
+              //:docs_combo -- \
               --github_user=${{ github.repository_owner }} \
               --github_repo=${{ github.event.repository.name }}
 
diff --git a/BUILD b/BUILD
index 7afff7dac7e..9cd0b69a0e3 100644
--- a/BUILD
+++ b/BUILD
@@ -32,6 +32,7 @@ docs(
         "@score_process//:needs_json",
         "@score_docs_as_code//:needs_json",
     ],
+    known_good = "known_good.json",
     source_dir = "docs",
 )
 
diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel
index 466ebb0372e..fd6d9729478 100644
--- a/bazel_common/score_modules_tooling.MODULE.bazel
+++ b/bazel_common/score_modules_tooling.MODULE.bazel
@@ -59,13 +59,17 @@ git_override(
 bazel_dep(name = "score_docs_as_code")
 git_override(
     module_name = "score_docs_as_code",
-    commit = "c1207676afe6cafd25c35d420e73279a799515d8",
+    commit = "8ba0bac2a4d90ac1352d09ad99a0602dbf800aef",
+    patch_strip = 1,
+    patches = [
+        "//patches/docs-as-code:remove-nonexisting-document.patch",
+    ],
     remote = "https://github.com/eclipse-score/docs-as-code.git",
 )
 
 bazel_dep(name = "score_process")
 git_override(
     module_name = "score_process",
-    commit = "fbe68f10041eb34fb791f08e31006afce8c9564a",
+    commit = "b08145aca82faa7d1c3a77fa4eab91aa9df31dd4",
     remote = "https://github.com/eclipse-score/process_description.git",
 )
diff --git a/docs/index.rst b/docs/index.rst
index bebf3bde3b1..87e7cce418a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -24,10 +24,11 @@ Newest Release Notes
    all_release_notes = []
 
    for need in needs:
-      if "wp__platform_sw_release_note" in need["realizes"]:
+      if "wp__platform_sw_release_note" in need["realizes"] and need.id.startswith("doc__score_v"):
          all_release_notes.append(need)
 
-   newest_release_note = max(all_release_notes, key=lambda s: int(re.search(r'v(\d+)', s["id"]).group(1)))
+
+   newest_release_note = max(all_release_notes, key=lambda s: int(re.search(r'v(\d+)', s.id).group(1)))
    results = [newest_release_note]
 
 Current Integration Status Overview
diff --git a/known_good.json b/known_good.json
index 1022d2e0e11..d9a454ebf5b 100644
--- a/known_good.json
+++ b/known_good.json
@@ -138,11 +138,14 @@
             },
             "score_docs_as_code": {
                 "repo": "https://github.com/eclipse-score/docs-as-code.git",
-                "hash": "c1207676afe6cafd25c35d420e73279a799515d8"
+                "hash": "8ba0bac2a4d90ac1352d09ad99a0602dbf800aef",
+                "bazel_patches": [
+                    "//patches/docs-as-code:remove-nonexisting-document.patch"
+                ]
             },
             "score_process": {
                 "repo": "https://github.com/eclipse-score/process_description.git",
-                "hash": "fbe68f10041eb34fb791f08e31006afce8c9564a"
+                "hash": "b08145aca82faa7d1c3a77fa4eab91aa9df31dd4"
             }
         }
     },
diff --git a/patches/docs-as-code/BUILD b/patches/docs-as-code/BUILD
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/patches/docs-as-code/remove-nonexisting-document.patch b/patches/docs-as-code/remove-nonexisting-document.patch
new file mode 100644
index 00000000000..64c0a991bf6
--- /dev/null
+++ b/patches/docs-as-code/remove-nonexisting-document.patch
@@ -0,0 +1,12 @@
+diff --git a/docs/internals/index.rst b/docs/internals/index.rst
+index 2d3e7975..05e785e5 100644
+--- a/docs/internals/index.rst
++++ b/docs/internals/index.rst
+@@ -8,7 +8,6 @@ This section is not relevant for users of docs-as-code but for developers extend
+ .. toctree::
+    :maxdepth: 1
+ 
+-   extensions/index
+    benchmark_results
+    decisions/index
+    requirements/index