diff --git a/.github/template_gitref b/.github/template_gitref
index 4b856ee91..354664565 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-423-g87f69ce
+unknown
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index bc90f1989..7ac2781ef 100644
--- a/.github/workflows/update_ci.yml
+++ b/.github/workflows/update_ci.yml
@@ -233,7 +233,7 @@ jobs:
         with:
           fetch-depth: 0
           path: "pulp_container"
-          ref: "2.22"
+          ref: "2.23"
 
       - name: "Run update"
         working-directory: "pulp_container"
@@ -242,21 +242,21 @@ jobs:
 
       - name: "Create Pull Request for CI files"
         uses: "peter-evans/create-pull-request@v6"
-        id: "create_pr_2_22"
+        id: "create_pr_2_23"
         with:
           token: "${{ secrets.RELEASE_TOKEN }}"
           path: "pulp_container"
           committer: "pulpbot <pulp-infra@redhat.com>"
           author: "pulpbot <pulp-infra@redhat.com>"
-          title: "Update CI files for branch 2.22"
-          branch: "update-ci/2.22"
-          base: "2.22"
+          title: "Update CI files for branch 2.23"
+          branch: "update-ci/2.23"
+          base: "2.23"
           delete-branch: true
       - name: "Mark PR automerge"
         working-directory: "pulp_container"
         run: |
-          gh pr merge --rebase --auto "${{ steps.create_pr_2_22.outputs.pull-request-number }}"
-        if: "steps.create_pr_2_22.outputs.pull-request-number"
+          gh pr merge --rebase --auto "${{ steps.create_pr_2_23.outputs.pull-request-number }}"
+        if: "steps.create_pr_2_23.outputs.pull-request-number"
         env:
           GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
diff --git a/CHANGES/1812.bugfix b/CHANGES/1812.bugfix
deleted file mode 100644
index bc1b1f9aa..000000000
--- a/CHANGES/1812.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a bug where the authentication scheme in the authorization header
-was not being parsed correctly.
diff --git a/CHANGES/1850.removal b/CHANGES/1850.removal
deleted file mode 100644
index 268c655ed..000000000
--- a/CHANGES/1850.removal
+++ /dev/null
@@ -1 +0,0 @@
-Rebased and squashed old migrations to prepare for pulpcore 3.70 compatibility.
diff --git a/CHANGES/1874.bugfix b/CHANGES/1874.bugfix
deleted file mode 100644
index a6c6e5713..000000000
--- a/CHANGES/1874.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed an issue in `DOCKER_MANIFEST_V1_SCHEMA` definition where the optional `jwk` header parameter
-was defined as required.
diff --git a/CHANGES/1887.bugfix b/CHANGES/1887.bugfix
deleted file mode 100644
index f6e8ad8a4..000000000
--- a/CHANGES/1887.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed flatpak index returning 500 when Manifest content was on_demand or had been reclaimed.
diff --git a/CHANGES/1910.misc b/CHANGES/1910.misc
deleted file mode 100644
index c960b25d5..000000000
--- a/CHANGES/1910.misc
+++ /dev/null
@@ -1 +0,0 @@
-Added support for pulpcore 3.70 `CONTENT_ORIGIN=None` feature.
diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py
index 6e831d11b..0e4de5aff 100644
--- a/pulp_container/app/__init__.py
+++ b/pulp_container/app/__init__.py
@@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_container.app"
     label = "container"
-    version = "2.23.0.dev"
+    version = "2.24.0.dev"
     python_package_name = "pulp-container"
 
     def ready(self):
diff --git a/pyproject.toml b/pyproject.toml
index ce50889e9..7992666b8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-container"
-version = "2.23.0.dev"
+version = "2.24.0.dev"
 description = "Container plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -87,7 +87,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "2.23.0.dev"
+current_version = "2.24.0.dev"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
diff --git a/template_config.yml b/template_config.yml
index 22b3bd69d..6b1703952 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-421-g204a709
+# generated with plugin_template@unknown
 
 api_root: /pulp/
 black: true
@@ -23,7 +23,7 @@ docker_fixtures: false
 flake8: true
 flake8_ignore: []
 github_org: pulp
-latest_release_branch: '2.22'
+latest_release_branch: '2.23'
 lint_requirements: true
 os_required_packages: []
 parallel_test_workers: 8
@@ -53,8 +53,8 @@ pulp_settings:
   - /tmp
   flatpak_index: true
 pulp_settings_azure:
-  flatpak_index: true
   content_origin: null
+  flatpak_index: true
 pulp_settings_gcp: null
 pulp_settings_s3:
   flatpak_index: false