diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index c6c21fdb..338ff697 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ ci_base | default("ghcr.io/pulp/pulp-ci-centos:" + pulp_container_tag) }}
+FROM {{ ci_base | default(pulp_default_container) }}
 
 # Add source directories to container
 {% for item in plugins %}
@@ -11,7 +11,7 @@ ADD ./{{ item.name }} ./{{ item.name }}
 
 RUN pip3 install
 {%- if s3_test | default(false) -%}
-{{ " " }}git+https://github.com/fabricio-aguiar/botocore.git@fix-100-continue
+{{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}
 {%- for item in plugins -%}
 {{ " " }}{{ item.source }}
diff --git a/.github/template_gitref b/.github/template_gitref
index 6cfa2261..2b533f2f 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-312-ge121aa6
+2021.08.26-315-g8ecb63d
diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml
index 1ae1a6a1..52460fc3 100644
--- a/.github/workflows/create-branch.yml
+++ b/.github/workflows/create-branch.yml
@@ -33,7 +33,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install bump2version jinja2 pyyaml
+          pip install bump2version jinja2 pyyaml packaging
           echo ::endgroup::
 
       - name: "Setting secrets"
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 61c7bba4..ef242f0d 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -82,9 +82,7 @@ cat >> vars/main.yaml << VARSYAML
 pulp_env: {}
 pulp_settings: {"allowed_content_checksums": ["sha1", "sha224", "sha256", "sha384", "sha512"], "allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "orphan_protection_time": 0}
 pulp_scheme: https
-
-pulp_container_tag: "latest"
-
+pulp_default_container: ghcr.io/pulp/pulp-ci-centos:latest
 VARSYAML
 
 SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "generate-bindings" "lowerbounds")
diff --git a/template_config.yml b/template_config.yml
index fc16c64b..555b2747 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-312-ge121aa6
+# generated with plugin_template@2021.08.26-315-g8ecb63d
 
 api_root: /pulp/
 black: true
@@ -9,6 +9,7 @@ check_commit_message: true
 check_gettext: true
 check_manifest: true
 check_stray_pulpcore_imports: true
+ci_base_image: ghcr.io/pulp/pulp-ci-centos
 ci_env: {}
 ci_trigger: '{pull_request: {branches: [''*'']}}'
 ci_update_docs: false