diff --git a/.github/template_gitref b/.github/template_gitref
index 379963b53..de382d8a6 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-80-g2510b8f
+2021.08.26-86-g469a472
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f257f0775..421d97591 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,6 +69,9 @@ jobs:
       - name: Run flake8
         run: flake8 --config flake8.cfg
 
+      - name: Run extra lint checks
+        run: "[ ! -x .ci/scripts/extra_linting.sh ] || .ci/scripts/extra_linting.sh"
+
       # check for any files unintentionally left out of MANIFEST.in
       - name: Check manifest
         run: check-manifest
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 55ebaae42..0bd55c9cd 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -93,7 +93,6 @@ if [ "$TEST" = "s3" ]; then
   sed -i -e '$a s3_test: true\
 minio_access_key: "'$MINIO_ACCESS_KEY'"\
 minio_secret_key: "'$MINIO_SECRET_KEY'"' vars/main.yaml
-
   echo "PULP_API_ROOT=/rerouted/djnd/" >> "$GITHUB_ENV"
   export PULP_API_ROOT="/rerouted/djnd/"
 fi
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index 9b8d0e144..6b5a45ada 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -46,7 +46,12 @@ if [[ "$TEST" = "docs" ]]; then
 fi
 
 if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
-  REPORTED_VERSION=$(http $PULP_URL/pulp/api/v3/status/ | jq --arg plugin container --arg legacy_plugin pulp_container -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')
+  STATUS_ENDPOINT="${PULP_URL}/pulp/api/v3/status/"
+  if [ "${PULP_API_ROOT:-}" ]; then
+    STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/"
+  fi
+  echo $STATUS_ENDPOINT
+  REPORTED_VERSION=$(http $STATUS_ENDPOINT | jq --arg plugin container --arg legacy_plugin pulp_container -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')
   response=$(curl --write-out %{http_code} --silent --output /dev/null https://pypi.org/project/pulp-container/$REPORTED_VERSION/)
   if [ "$response" == "200" ];
   then
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index aca559967..252a945fe 100644
--- a/.github/workflows/update_ci.yml
+++ b/.github/workflows/update_ci.yml
@@ -41,6 +41,7 @@ jobs:
           author: pulpbot <pulp-infra@redhat.com>
           title: 'Update CI files'
           body: '[noissue]'
+          branch: 'create-pull-request/${{ github.ref }}/patch'
           commit-message: |
             Update CI files
 
diff --git a/template_config.yml b/template_config.yml
index 201f01126..6d84b0203 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-71-g2d3b35c
+# generated with plugin_template@2021.08.26-86-g469a472
 
 additional_repos: []
 aiohttp_fixtures_origin: 172.18.0.1
@@ -73,6 +73,7 @@ test_cli: true
 test_deprecations: true
 test_performance: false
 test_released_plugin_with_next_pulpcore_release: true
+test_reroute: true
 test_s3: true
 update_github: true
 update_redmine: false