diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index 6cf81f25b..afe0b118d 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -9,7 +9,9 @@ ADD ./{{ item.name }} ./{{ item.name }}
 # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads
 # Hacking botocore (https://github.com/boto/botocore/pull/1990)
 
-RUN pip3 install
+RUN pip3 install --upgrade pip setuptools wheel && \
+  rm -rf /root/.cache/pip && \
+  pip3 install
 {%- if s3_test | default(false) -%}
 {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}
@@ -25,7 +27,8 @@ RUN pip3 install
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
-{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
+  rm -rf /root/.cache/pip
 
 {% if pulp_env is defined and pulp_env %}
 {% for key, value in pulp_env.items() %}
diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py
index 37ba326a5..4c9efab2a 100755
--- a/.ci/scripts/calc_constraints.py
+++ b/.ci/scripts/calc_constraints.py
@@ -62,6 +62,8 @@ def to_upper_bound(req):
                     max_version = f"{version.major}.{version.minor}.{version.micro-1}"
                 elif version.minor != 0:
                     max_version = f"{version.major}.{version.minor-1}"
+                elif version.major != 0:
+                    max_version = f"{version.major-1}.0"
                 else:
                     return f"# NO BETTER CONSTRAINT: {req}"
                 return f"{requirement.name}{operator}{max_version}"
diff --git a/.github/template_gitref b/.github/template_gitref
index c16f42b6e..3d9674dcd 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-354-g82d22de
+2021.08.26-361-gcd6f9f0
diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh
index 456e97677..ec4988962 100755
--- a/.github/workflows/scripts/build_python_client.sh
+++ b/.github/workflows/scripts/build_python_client.sh
@@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_container-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulp_container/container-api.json" .
-./gen-client.sh "container-api.json" "container" python "pulp_container"
+./gen-client.sh "../pulp_container/container-api.json" "container" python "pulp_container"
 
 pushd pulp_container-client
 python setup.py sdist bdist_wheel --python-tag py3
diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh
index 0786c510a..deb3e8e39 100755
--- a/.github/workflows/scripts/build_ruby_client.sh
+++ b/.github/workflows/scripts/build_ruby_client.sh
@@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_container-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulp_container/container-api.json" .
-#./gen-client.sh "container-api.json" "container" ruby "pulp_container"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulp_container/api.json" .
-./gen-client.sh "api.json" "container" ruby "pulp_container"
-# -------------
+./gen-client.sh "../pulp_container/container-api.json" "container" ruby "pulp_container"
 
 pushd pulp_container-client
 gem build pulp_container_client
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fcc6f1e9..1552a8caa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,6 @@ jobs:
       matrix:
         env:
           - TEST: pulp
-          - TEST: docs
           - TEST: azure
           - TEST: s3
           - TEST: lowerbounds
diff --git a/template_config.yml b/template_config.yml
index 2f1323dd5..17d349f17 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -22,7 +22,7 @@ deploy_to_pypi: true
 disabled_redis_runners: []
 doc_requirements_from_pulpcore: true
 docker_fixtures: false
-docs_test: true
+docs_test: false
 flake8: true
 flake8_ignore: []
 github_org: pulp