diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index bad75f3b..6cf81f25 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -15,6 +15,9 @@ RUN pip3 install
 {%- endif -%}
 {%- for item in plugins -%}
 {{ " " }}{{ item.source }}
+{%- if item.upperbounds | default(false) -%}
+{{ " " }}-c ./{{ item.name }}/upperbounds_constraints.txt
+{%- endif -%}
 {%- if item.lowerbounds | default(false) -%}
 {{ " " }}-c ./{{ item.name }}/lowerbounds_constraints.txt
 {%- endif -%}
diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py
new file mode 100755
index 00000000..811f2125
--- /dev/null
+++ b/.ci/scripts/calc_constraints.py
@@ -0,0 +1,116 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_gem' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+import argparse
+import fileinput
+import urllib.request
+import sys
+from packaging.requirements import Requirement
+from packaging.version import Version
+import yaml
+
+
+CORE_TEMPLATE_URL = "https://raw.githubusercontent.com/pulp/pulpcore/main/template_config.yml"
+
+
+def fetch_pulpcore_upper_bound(requirement):
+    with urllib.request.urlopen(CORE_TEMPLATE_URL) as f:
+        template = yaml.safe_load(f.read())
+    supported_versions = template["supported_release_branches"]
+    supported_versions.append(template["latest_release_branch"])
+    applicable_versions = sorted(
+        requirement.specifier.filter((Version(v) for v in supported_versions))
+    )
+    if len(applicable_versions) == 0:
+        raise Exception("No supported pulpcore version in required range.")
+    return f"{requirement.name}~={applicable_versions[-1]}"
+
+
+def split_comment(line):
+    split_line = line.split("#", maxsplit=1)
+    try:
+        comment = "  # " + split_line[1].strip()
+    except IndexError:
+        comment = ""
+    return split_line[0].strip(), comment
+
+
+def to_upper_bound(req):
+    try:
+        requirement = Requirement(req)
+    except ValueError:
+        return f"# UNPARSABLE: {req}"
+    else:
+        if requirement.name == "pulpcore":
+            # An exception to allow for pulpcore deprecation policy.
+            return fetch_pulpcore_upper_bound(requirement)
+        for spec in requirement.specifier:
+            if spec.operator == "~=":
+                return f"# NO BETTER CONSTRAINT: {req}"
+            if spec.operator == "<=":
+                operator = "=="
+                max_version = spec.version
+                return f"{requirement.name}{operator}{max_version}"
+            if spec.operator == "<":
+                operator = "~="
+                version = Version(spec.version)
+                if version.micro != 0:
+                    max_version = f"{version.major}.{version.minor}.{version.micro-1}"
+                elif version.minor != 0:
+                    max_version = f"{version.major}.{version.minor-1}"
+                else:
+                    return f"# NO BETTER CONSTRAINT: {req}"
+                return f"{requirement.name}{operator}{max_version}"
+        return f"# NO UPPER BOUND: {req}"
+
+
+def to_lower_bound(req):
+    try:
+        requirement = Requirement(req)
+    except ValueError:
+        return f"# UNPARSABLE: {req}"
+    else:
+        for spec in requirement.specifier:
+            if spec.operator == ">=":
+                if requirement.name == "pulpcore":
+                    # Currently an exception to allow for pulpcore bugfix releases.
+                    # TODO Semver libraries should be allowed too.
+                    operator = "~="
+                else:
+                    operator = "=="
+                min_version = spec.version
+                return f"{requirement.name}{operator}{min_version}"
+        return f"# NO LOWER BOUND: {req}"
+
+
+def main():
+    """Calculate constraints for the lower bound of dependencies where possible."""
+    parser = argparse.ArgumentParser(
+        prog=sys.argv[0],
+        description="Calculate constraints for the lower or upper bound of dependencies where "
+        "possible.",
+    )
+    parser.add_argument("-u", "--upper", action="store_true")
+    parser.add_argument("filename", nargs="*")
+    args = parser.parse_args()
+
+    with fileinput.input(files=args.filename) as req_file:
+        for line in req_file:
+            if line.strip().startswith("#"):
+                # Shortcut comment only lines
+                print(line.strip())
+            else:
+                req, comment = split_comment(line)
+                if args.upper:
+                    new_req = to_upper_bound(req)
+                else:
+                    new_req = to_lower_bound(req)
+                print(new_req + comment)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.ci/scripts/calc_deps_lowerbounds.py b/.ci/scripts/calc_deps_lowerbounds.py
deleted file mode 100755
index 3bc3fd3d..00000000
--- a/.ci/scripts/calc_deps_lowerbounds.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_gem' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-from packaging.requirements import Requirement
-
-
-def main():
-    """Calculate the lower bound of dependencies where possible."""
-    with open("requirements.txt") as req_file:
-        for line in req_file:
-            try:
-                requirement = Requirement(line)
-            except ValueError:
-                print(line.strip())
-            else:
-                for spec in requirement.specifier:
-                    if spec.operator == ">=":
-                        if requirement.name == "pulpcore":
-                            operator = "~="
-                        else:
-                            operator = "=="
-                        min_version = str(spec)[2:]
-                        print(f"{requirement.name}{operator}{min_version}")
-                        break
-                else:
-                    print(line.strip())
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/template_gitref b/.github/template_gitref
index 19b4c781..c16f42b6 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-349-gba81617
+2021.08.26-354-g82d22de
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
deleted file mode 100644
index 3a82f654..00000000
--- a/.github/workflows/changelog.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_gem' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
----
-name: "Gem changelog update"
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "CHANGES.rst"
-      - "CHANGES.md"
-  workflow_dispatch:
-
-jobs:
-
-  update-changelog:
-    runs-on: "ubuntu-latest"
-    strategy:
-      fail-fast: false
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install -r doc_requirements.txt
-          echo ::endgroup::
-
-      - name: "Fake api schema"
-        run: |
-          mkdir -p docs/_build/html
-          echo "{}" > docs/_build/html/api.json
-          mkdir -p docs/_static
-          echo "{}" > docs/_static/api.json
-      - name: "Build Docs"
-        run: |
-          make diagrams html
-        working-directory: "./docs"
-        env:
-          PULP_CONTENT_ORIGIN: "http://localhost/"
-
-      - name: "Publish changlog to pulpproject.org"
-        run: |
-          .github/workflows/scripts/publish_docs.sh changelog ${GITHUB_REF##*/}
-        env:
-          PULP_DOCS_KEY: "${{ secrets.PULP_DOCS_KEY }}"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e93a6c5d..7828b5f3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -65,55 +65,3 @@ jobs:
           branch: "changelog/update"
           delete-branch: true
           path: "pulp_gem"
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_gem"
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: "plugin_package"
-          path: "pulp_gem/dist/"
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install requests 'packaging~=21.3' mkdocs pymdown-extensions 'Jinja2<3.1'
-          echo ::endgroup::
-
-      - name: "Set environment variables"
-        run: |
-          echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
-
-      - name: Download built docs
-        uses: actions/download-artifact@v4
-        with:
-          name: "docs.tar"
-          path: "pulp_gem"
-
-      - name: Download Python client docs
-        uses: actions/download-artifact@v4
-        with:
-          name: "python-client-docs.tar"
-          path: "pulp_gem"
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
-      - name: Publish docs to pulpproject.org
-        run: |
-          tar -xvf docs.tar -C ./docs
-          .github/workflows/scripts/publish_docs.sh nightly ${GITHUB_REF##*/}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 41c07c4d..72632874 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -137,52 +137,6 @@ jobs:
       - name: "Publish client to rubygems"
         run: |
           bash .github/workflows/scripts/publish_client_gem.sh ${{ github.ref_name }}
-  publish-docs:
-    runs-on: "ubuntu-latest"
-    needs:
-      - "build"
-
-    env:
-      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_gem"
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install 'packaging~=21.3' requests
-          echo ::endgroup::
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
-      - name: "Download built docs"
-        uses: "actions/download-artifact@v4"
-        with:
-          name: "docs.tar"
-          path: "pulp_gem/"
-
-      - name: "Download Python client docs"
-        uses: "actions/download-artifact@v4"
-        with:
-          name: "python-client-docs.tar"
-          path: "pulp_gem/"
-
-      - name: "Publish docs to pulpproject.org"
-        run: |
-          tar -xvf docs.tar
-          .github/workflows/scripts/publish_docs.sh tag ${{ github.ref_name }}
 
   create-gh-release:
     runs-on: "ubuntu-latest"
@@ -191,7 +145,6 @@ jobs:
       - "publish-package"
       - "publish-python-bindings"
       - "publish-ruby-bindings"
-      - "publish-docs"
 
     steps:
       - name: "Create release on GitHub"
diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
index eeea7ace..94e6c5dc 100755
--- a/.github/workflows/scripts/before_install.sh
+++ b/.github/workflows/scripts/before_install.sh
@@ -65,9 +65,11 @@ then
   exit $s
 fi
 
+if [[ "$TEST" = "pulp" ]]; then
+  python3 .ci/scripts/calc_constraints.py -u requirements.txt > upperbounds_constraints.txt
+fi
 if [[ "$TEST" = "lowerbounds" ]]; then
-  python3 .ci/scripts/calc_deps_lowerbounds.py > lowerbounds_constraints.txt
-  sed -i 's/\[.*\]//g' lowerbounds_constraints.txt
+  python3 .ci/scripts/calc_constraints.py requirements.txt > lowerbounds_constraints.txt
 fi
 
 if [ -f $POST_BEFORE_INSTALL ]; then
diff --git a/.github/workflows/scripts/docs-publisher.py b/.github/workflows/scripts/docs-publisher.py
deleted file mode 100755
index 9352904f..00000000
--- a/.github/workflows/scripts/docs-publisher.py
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/env python
-
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_gem' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-import argparse
-import subprocess
-import os
-import re
-from shutil import rmtree
-import tempfile
-import requests
-import json
-from packaging import version
-
-WORKING_DIR = os.environ["WORKSPACE"]
-
-VERSION_REGEX = r"(\s*)(version)(\s*)(=)(\s*)(['\"])(.*)(['\"])(.*)"
-RELEASE_REGEX = r"(\s*)(release)(\s*)(=)(\s*)(['\"])(.*)(['\"])(.*)"
-
-USERNAME = "doc_builder_pulp_gem"
-HOSTNAME = "8.43.85.236"
-
-SITE_ROOT = "/var/www/docs.pulpproject.org/pulp_gem/"
-
-
-def make_directory_with_rsync(remote_paths_list):
-    """
-    Ensure the remote directory path exists.
-
-    :param remote_paths_list: The list of parameters. e.g. ['en', 'latest'] to be en/latest on the
-        remote.
-    :type remote_paths_list: a list of strings, with each string representing a directory.
-    """
-    try:
-        tempdir_path = tempfile.mkdtemp()
-        cwd = os.getcwd()
-        os.chdir(tempdir_path)
-        os.makedirs(os.sep.join(remote_paths_list))
-        remote_path_arg = "%s@%s:%s%s" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            remote_paths_list[0],
-        )
-        local_path_arg = tempdir_path + os.sep + remote_paths_list[0] + os.sep
-        rsync_command = ["rsync", "-avzh", local_path_arg, remote_path_arg]
-        exit_code = subprocess.call(rsync_command)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while creating remote directories.")
-    finally:
-        rmtree(tempdir_path)
-        os.chdir(cwd)
-
-
-def ensure_dir(target_dir, clean=True):
-    """
-    Ensure that the directory specified exists and is empty.
-
-    By default this will delete the directory if it already exists
-
-    :param target_dir: The directory to process
-    :type target_dir: str
-    :param clean: Whether or not the directory should be removed and recreated
-    :type clean: bool
-    """
-    if clean:
-        rmtree(target_dir, ignore_errors=True)
-    try:
-        os.makedirs(target_dir)
-    except OSError:
-        pass
-
-
-def main():
-    """
-    Builds documentation using the 'make html' command and rsyncs to docs.pulpproject.org.
-    """
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--build-type", required=True, help="Build type: nightly, tag or changelog."
-    )
-    parser.add_argument("--branch", required=True, help="Branch or tag name.")
-    opts = parser.parse_args()
-
-    build_type = opts.build_type
-
-    branch = opts.branch
-
-    publish_at_root = False
-
-    # rsync the docs
-    print("rsync the docs")
-    docs_directory = os.sep.join([WORKING_DIR, "docs"])
-    local_path_arg = os.sep.join([docs_directory, "_build", "html"]) + os.sep
-    if build_type == "nightly":
-        # This is a nightly build
-        remote_path_arg = "%s@%s:%sen/%s/%s/" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            branch,
-            build_type,
-        )
-        make_directory_with_rsync(["en", branch, build_type])
-        rsync_command = ["rsync", "-avzh", "--delete", local_path_arg, remote_path_arg]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    elif build_type == "tag":
-        if (not re.search("[a-zA-Z]", branch) or "post" in branch) and len(branch.split(".")) > 2:
-            # Only publish docs at the root if this is the latest version
-            r = requests.get("https://pypi.org/pypi/pulp-gem/json")
-            latest_version = version.parse(json.loads(r.text)["info"]["version"])
-            docs_version = version.parse(branch)
-            # This is to mitigate delays on PyPI which doesn't update metadata in timely manner.
-            # It doesn't prevent incorrect docs being published at root if 2 releases are done close
-            # to each other, within PyPI delay. E.g. Release 3.11.0 an then 3.10.1 immediately
-            # after.
-            if docs_version >= latest_version:
-                publish_at_root = True
-            # Post releases should use the x.y.z part of the version string to form a path
-            if "post" in branch:
-                branch = ".".join(branch.split(".")[:-1])
-
-            # This is a GA build.
-            # publish to the root of docs.pulpproject.org
-            if publish_at_root:
-                version_components = branch.split(".")
-                x_y_version = "{}.{}".format(version_components[0], version_components[1])
-                remote_path_arg = "%s@%s:%s" % (USERNAME, HOSTNAME, SITE_ROOT)
-                rsync_command = [
-                    "rsync",
-                    "-avzh",
-                    "--delete",
-                    "--exclude",
-                    "en",
-                    "--omit-dir-times",
-                    local_path_arg,
-                    remote_path_arg,
-                ]
-                exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-                if exit_code != 0:
-                    raise RuntimeError("An error occurred while pushing docs.")
-                # publish to docs.pulpproject.org/en/3.y/
-                make_directory_with_rsync(["en", x_y_version])
-                remote_path_arg = "%s@%s:%sen/%s/" % (
-                    USERNAME,
-                    HOSTNAME,
-                    SITE_ROOT,
-                    x_y_version,
-                )
-                rsync_command = [
-                    "rsync",
-                    "-avzh",
-                    "--delete",
-                    "--omit-dir-times",
-                    local_path_arg,
-                    remote_path_arg,
-                ]
-                exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-                if exit_code != 0:
-                    raise RuntimeError("An error occurred while pushing docs.")
-            # publish to docs.pulpproject.org/en/3.y.z/
-            make_directory_with_rsync(["en", branch])
-            remote_path_arg = "%s@%s:%sen/%s/" % (USERNAME, HOSTNAME, SITE_ROOT, branch)
-            rsync_command = [
-                "rsync",
-                "-avzh",
-                "--delete",
-                "--omit-dir-times",
-                local_path_arg,
-                remote_path_arg,
-            ]
-            exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-            if exit_code != 0:
-                raise RuntimeError("An error occurred while pushing docs.")
-        else:
-            # This is a pre-release
-            make_directory_with_rsync(["en", branch])
-            remote_path_arg = "%s@%s:%sen/%s/%s/" % (
-                USERNAME,
-                HOSTNAME,
-                SITE_ROOT,
-                branch,
-                build_type,
-            )
-            rsync_command = [
-                "rsync",
-                "-avzh",
-                "--delete",
-                "--exclude",
-                "nightly",
-                "--exclude",
-                "testing",
-                local_path_arg,
-                remote_path_arg,
-            ]
-            exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-            if exit_code != 0:
-                raise RuntimeError("An error occurred while pushing docs.")
-        # publish to docs.pulpproject.org/en/3.y/
-        version_components = branch.split(".")
-        x_y_version = "{}.{}".format(version_components[0], version_components[1])
-        make_directory_with_rsync(["en", x_y_version])
-        remote_path_arg = "%s@%s:%sen/%s/" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            x_y_version,
-        )
-        rsync_command = [
-            "rsync",
-            "-avzh",
-            "--delete",
-            "--omit-dir-times",
-            local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-        # publish to docs.pulpproject.org/en/3.y.z/
-        make_directory_with_rsync(["en", branch])
-        remote_path_arg = "%s@%s:%sen/%s/" % (USERNAME, HOSTNAME, SITE_ROOT, branch)
-        rsync_command = [
-            "rsync",
-            "-avzh",
-            "--delete",
-            "--omit-dir-times",
-            local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    elif build_type == "changelog":
-        if branch != "main":
-            raise RuntimeError("Can only publish CHANGELOG from main")
-        # Publish the CHANGELOG from main branch at the root directory
-        remote_path_arg = "%s@%s:%s" % (USERNAME, HOSTNAME, SITE_ROOT)
-        changelog_local_path_arg = os.path.join(local_path_arg, "changes.html")
-        rsync_command = [
-            "rsync",
-            "-vzh",
-            "--omit-dir-times",
-            changelog_local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    else:
-        raise RuntimeError("Build type must be either 'nightly', 'tag' or 'changelog'.")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 9bd4c5ff..dc4cfe69 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -55,6 +55,11 @@ if [[ -f ../../ci_requirements.txt ]]; then
     ci_requirements: true
 VARSYAML
 fi
+if [ "$TEST" = "pulp" ]; then
+  cat >> vars/main.yaml << VARSYAML
+    upperbounds: true
+VARSYAML
+fi
 if [ "$TEST" = "lowerbounds" ]; then
   cat >> vars/main.yaml << VARSYAML
     lowerbounds: true
diff --git a/.github/workflows/scripts/publish_docs.sh b/.github/workflows/scripts/publish_docs.sh
deleted file mode 100755
index c81580da..00000000
--- a/.github/workflows/scripts/publish_docs.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_gem' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-set -euv
-
-# make sure this script runs at the repo root
-cd "$(dirname "$(realpath -e "$0")")/../../.."
-
-mkdir ~/.ssh
-touch ~/.ssh/pulp-infra
-chmod 600 ~/.ssh/pulp-infra
-echo "$PULP_DOCS_KEY" > ~/.ssh/pulp-infra
-
-echo "docs.pulpproject.org,8.43.85.236 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGXG+8vjSQvnAkq33i0XWgpSrbco3rRqNZr0SfVeiqFI7RN/VznwXMioDDhc+hQtgVhd6TYBOrV07IMcKj+FAzg=" >> ~/.ssh/known_hosts
-chmod 644 ~/.ssh/known_hosts
-
-export PYTHONUNBUFFERED=1
-export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
-export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py
-export WORKSPACE=$PWD
-
-# start the ssh agent
-eval "$(ssh-agent -s)"
-ssh-add ~/.ssh/pulp-infra
-
-python3 .github/workflows/scripts/docs-publisher.py --build-type "$1" --branch "$2"
-
-if [[ "$GITHUB_WORKFLOW" == "Gem changelog update" ]]; then
-  # Do not build bindings docs on changelog update
-  exit
-fi
-
-mkdir -p ../gem-bindings
-tar -xvf gem-python-client-docs.tar --directory ../gem-bindings
-pushd ../gem-bindings
-
-# publish to docs.pulpproject.org/pulp_gem_client
-rsync -avzh site/ doc_builder_pulp_gem@docs.pulpproject.org:/var/www/docs.pulpproject.org/pulp_gem_client/
-
-# publish to docs.pulpproject.org/pulp_gem_client/en/{release}
-rsync -avzh site/ doc_builder_pulp_gem@docs.pulpproject.org:/var/www/docs.pulpproject.org/pulp_gem_client/en/"$2"
-popd
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index e23c5876..7225d8c3 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -16,7 +16,6 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 source .github/workflows/scripts/utils.sh
 
 export POST_SCRIPT=$PWD/.github/workflows/scripts/post_script.sh
-export POST_DOCS_TEST=$PWD/.github/workflows/scripts/post_docs_test.sh
 export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh
 
 # Needed for both starting the service and building the docs.
@@ -31,17 +30,7 @@ if [[ "$TEST" = "docs" ]]; then
   if [[ "$GITHUB_WORKFLOW" == "Gem 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
-  tar -cvf docs.tar ./_build
-  cd ..
-
-  if [ -f "$POST_DOCS_TEST" ]; then
-    source "$POST_DOCS_TEST"
-  fi
   exit
 fi
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9de567f7..d4aa0a9e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -137,15 +137,6 @@ jobs:
           if-no-files-found: "error"
           retention-days: 5
           overwrite: true
-      - name: Upload built docs
-        if: ${{ env.TEST == 'docs' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: "docs.tar"
-          path: "pulp_gem/docs/docs.tar"
-          if-no-files-found: "error"
-          retention-days: 5
-          overwrite: true
 
       - name: "Logs"
         if: always()
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index a296998d..381a07ae 100644
--- a/.github/workflows/update_ci.yml
+++ b/.github/workflows/update_ci.yml
@@ -79,7 +79,7 @@ jobs:
       - name: "Run update"
         working-directory: "pulp_gem"
         run: |
-          ../plugin_template/scripts/update_ci.sh
+          ../plugin_template/scripts/update_ci.sh --release
 
       - name: "Create Pull Request for CI files"
         uses: "peter-evans/create-pull-request@v6"
diff --git a/doc_requirements.txt b/doc_requirements.txt
index 2beeb141..5e17ba97 100644
--- a/doc_requirements.txt
+++ b/doc_requirements.txt
@@ -7,15 +7,4 @@
 -r requirements.txt
 towncrier
 
-# Legacy docs
-plantuml
-sphinx~=7.1.2
-sphinx-rtd-theme==1.3.0
-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 19b4c781..c16f42b6 100644
--- a/docs/template_gitref
+++ b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-349-gba81617
+2021.08.26-354-g82d22de
diff --git a/template_config.yml b/template_config.yml
index ebcd38ab..1f7694f9 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -1,7 +1,7 @@
 # This config represents the latest values used when running the plugin-template. Any settings that
 # were not present before running plugin-template have been added with their default values.
 
-# generated with plugin_template@2021.08.26-347-gc4a2504
+# generated with plugin_template@2021.08.26-354-g82d22de
 
 api_root: /pulp/
 black: true
@@ -23,7 +23,6 @@ disabled_redis_runners: []
 doc_requirements_from_pulpcore: false
 docker_fixtures: false
 docs_test: true
-extra_docs_requirements: []
 flake8: true
 flake8_ignore: []
 github_org: pulp
@@ -42,7 +41,6 @@ plugins:
   name: pulp_gem
 post_job_template: null
 pre_job_template: null
-publish_docs_to_pulpprojectdotorg: true
 pulp_env: {}
 pulp_env_azure: {}
 pulp_env_gcp: {}
@@ -77,6 +75,4 @@ test_performance: false
 test_reroute: true
 test_s3: true
 use_issue_template: true
-use_legacy_docs: true
-use_unified_docs: true