diff --git a/builders.py b/builders.py
index 2d42d07..8ecf688 100644
--- a/builders.py
+++ b/builders.py
@@ -486,11 +486,20 @@ def create_doc_builder_factory():
         mode='incremental',
         haltOnFailure=True,
         name='Fetch bitbake'))
+    f.addStep(steps.Git(
+        repourl=util.Interpolate("%(prop:repo_oecore)s"),
+        branch=util.Property('branch_oecore'),
+        codebase='oecore',
+        workdir=util.Interpolate("%(prop:builddir)s/openembedded-core"),
+        mode='incremental',
+        haltOnFailure=True,
+        name='Fetch openembedded-core'))
     f.addStep(steps.ShellCommand(
         command=[util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/run-docs-build"),
                  util.Interpolate("%(prop:builddir)s"),
                  util.Interpolate("%(prop:builddir)s/yocto-docs"),
-                 util.Interpolate("%(prop:builddir)s/bitbake")],
+                 util.Interpolate("%(prop:builddir)s/bitbake"),
+                 util.Interpolate("%(prop:builddir)s/openembedded-core")],
         haltOnFailure=True,
         name="Run documentation Build"))
     return f
diff --git a/config.py b/config.py
index 7c675ab..c84af33 100644
--- a/config.py
+++ b/config.py
@@ -26,7 +26,7 @@ buildertorepos = {
     "checkuri": baserepos,
     "check-layer": baserepos + ["meta-mingw"],
     "check-layer-nightly": baserepos + ["meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein", "meta-qcom", "meta-riscv", "mixin-wrynose-linux-firmware", "meta-mingw"],
-    "docs": ["yocto-autobuilder-helper", "yocto-docs", "bitbake"],
+    "docs": ["yocto-autobuilder-helper", "yocto-docs", "bitbake", "oecore"],
     "reproducible-meta-oe": baserepos + ["meta-openembedded"],
     "patchtest": baserepos + ["meta-patchtest", "meta-openembedded"],
     "meta-oe-mirror":  baserepos + ["meta-openembedded"],
diff --git a/schedulers.py b/schedulers.py
index 5b5cf64..0022393 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -675,6 +675,12 @@ schedulers.append(sched.ForceScheduler(
                                           revision=util.FixedParameter(name="revision", default=""),
                                           repository=util.FixedParameter(name="repository", default=""),
                                           project=util.FixedParameter(name="project", default="")),
+                   util.CodebaseParameter(codebase='oecore',
+                                          label="openembedded-core:",
+                                          branch=util.FixedParameter(name="branch", default=""),
+                                          revision=util.FixedParameter(name="revision", default=""),
+                                          repository=util.FixedParameter(name="repository", default=""),
+                                          project=util.FixedParameter(name="project", default="")),
                    ],
         reason=util.StringParameter(
                 name="reason",
