diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py
index 3d305d622..7775fed82 100755
--- a/.ci/scripts/check_release.py
+++ b/.ci/scripts/check_release.py
@@ -82,35 +82,11 @@ def main():
                     f"{last_tag}", f"origin/{branch}", "--name-only", "--", "requirements.txt"
                 )
                 if z_changelog or req_txt_diff:
-                    # Blobless clone does not have file contents for Z branches,
-                    # check commit message for last Z bump
-                    git_branch = f"origin/{branch}"
-                    next_version = None
-                    bump_commit = repo.git.log(
-                        "--oneline",
-                        "--grep=Bump version",
-                        "-n 1",
-                        git_branch,
-                        "--",
-                        ".bumpversion.cfg",
-                    )
-                    if bump_commit:
-                        next_version = bump_commit.split("→ ")[-1]
-                    # If not found - try old-commit-msg
-                    if not next_version:
-                        bump_commit = repo.git.log(
-                            "--oneline",
-                            "--grep=Bump to",
-                            "-n 1",
-                            git_branch,
-                            "--",
-                            ".bumpversion.cfg",
-                        )
-                        next_version = bump_commit.split("to ")[-1] if bump_commit else None
-
-                    # You could, theoretically, be next_vers==None here - but that's always
-                    # been true for this script.
-                    next_version = Version(next_version)
+                    curr_version = Version(last_tag)
+                    assert curr_version.base_version.startswith(
+                        branch
+                    ), "Current-version has to belong to the current branch!"
+                    next_version = Version(f"{branch}.{curr_version.micro + 1}")
                     reason = "CHANGES" if z_changelog else "requirements.txt"
                     print(
                         f"A Z-release is needed for {branch}, "
diff --git a/.github/template_gitref b/.github/template_gitref
index 9ec4e6fe6..418b21cd4 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-326-ge5addc7
+2021.08.26-327-g6a0d984
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index e1c51b407..60919c424 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -31,6 +31,8 @@ if [[ "$TEST" = "docs" ]]; then
   if [[ "$GITHUB_WORKFLOW" == "Container CI" ]]; then
     towncrier build --yes --version 4.0.0.ci
   fi
+  # Unified Docs Build
+  pulp-docs build
   # Legacy Docs Build
   cd docs
   make PULP_URL="$PULP_URL" diagrams html
diff --git a/CHANGES/+docs-ci.misc b/CHANGES/+docs-ci.misc
new file mode 100644
index 000000000..91a157185
--- /dev/null
+++ b/CHANGES/+docs-ci.misc
@@ -0,0 +1 @@
+Added the Unified Docs CI build-check on PRs.
diff --git a/doc_requirements.txt b/doc_requirements.txt
index 119618d07..f41b19a40 100644
--- a/doc_requirements.txt
+++ b/doc_requirements.txt
@@ -15,4 +15,7 @@ sphinxcontrib-jquery
 sphinxcontrib-openapi
 mistune<4.0.0
 Jinja2<3.2
+
+# Unified docs
+pulp-docs @ git+https://github.com/pulp/pulp-docs@main
 # Extra requirements
diff --git a/docs/template_gitref b/docs/template_gitref
index 9ec4e6fe6..e169228ce 100644
--- a/docs/template_gitref
+++ b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-326-ge5addc7
+2021.08.26-327-g520b576
diff --git a/template_config.yml b/template_config.yml
index 36c3183b0..5c0f104cc 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -87,5 +87,5 @@ test_reroute: true
 test_s3: true
 use_issue_template: true
 use_legacy_docs: true
-use_unified_docs: false
+use_unified_docs: true