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..9e5cdc029 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-354-g82d22de
+2021.08.26-364-g6f9579c
diff --git a/.github/workflows/kanban.yml b/.github/workflows/kanban.yml
deleted file mode 100644
index bc2356d38..000000000
--- a/.github/workflows/kanban.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_container' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-# Manage issues in a project board using https://github.com/leonsteinhaeuser/project-beta-automations
-
----
-name: Kanban
-on:
-  pull_request_target:
-  issues:
-    types:
-      - labeled
-      - reopened
-      - assigned
-      - closed
-
-env:
-  free_to_take: Free to take
-  in_progress: In Progress
-  needs_review: Needs review
-  done: Done
-
-jobs:
-  # only prio-list labeled items should be added to the board
-  add-to-project-board:
-    if: github.event_name == 'issues' && contains(github.event.issue.labels.*.name, 'prio-list') && contains(fromJson('["labeled", "reopened"]'), github.event.action)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add issue to Free-to-take list
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.free_to_take }} # Target status
-
-  move-to-inprogress:
-    if: github.event_name == 'issues' && github.event.action == 'assigned'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Move an issue to the In Progress column
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.in_progress }} # Target status
-
-  find-linked-issues:
-    if: github.event_name == 'pull_request_target'
-    runs-on: ubuntu-latest
-    name: Find issues linked to a PR
-    outputs:
-      linked-issues: ${{ steps.linked-issues.outputs.issues }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Get Linked Issues Action
-        uses: kin/gh-action-get-linked-issues@v1.0
-        id: linked-issues
-        with:
-          access-token: ${{ secrets.RELEASE_TOKEN }}
-
-  move-to-needs-review:
-    if: github.event_name == 'pull_request_target' && contains(fromJson(needs.find-linked-issues.outputs.linked-issues).*.issue.state, 'open')
-    runs-on: ubuntu-latest
-    name: Move linked issues to Needs Review
-    needs: find-linked-issues
-    strategy:
-      max-parallel: 3
-      matrix:
-        issues: ${{ fromJSON(needs.find-linked-issues.outputs.linked-issues) }}
-    steps:
-      - name: Move to Needs Review
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ matrix.issues.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.needs_review }} # Target status
-
-  move-to-done:
-    if: github.event_name == 'issues' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Move an issue to the Done column
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.done }} # Target status
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/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index 3f657cbd9..378b12eaa 100644
--- a/.github/workflows/update_ci.yml
+++ b/.github/workflows/update_ci.yml
@@ -11,8 +11,8 @@ name: "Container CI Update"
 on:
   schedule:
     # * is a special character in YAML so you have to quote this string
-    # runs at 2:30 UTC every Sunday
-    - cron: '30 2 * * 0'
+    # runs at 3:30 UTC every Sunday
+    - cron: '30 3 * * 0'
   workflow_dispatch:
 
 jobs:
diff --git a/template_config.yml b/template_config.yml
index 2f1323dd5..55b52cb8a 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-354-g82d22de
+# generated with plugin_template@2021.08.26-364-g6f9579c
 
 api_root: /pulp/
 black: true
@@ -22,12 +22,11 @@ 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
 issue_tracker: github
-kanban: true
 latest_release_branch: null
 lint_requirements: true
 noissue_marker: '[noissue]'