diff --git a/.github/template_gitref b/.github/template_gitref
index 4630e6c46..354664565 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-421-g204a709
+unknown
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index f23d6392c..ce43ae082 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   test:
     if: "endsWith(github.base_ref, 'main')"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     defaults:
       run:
         working-directory: "pulp_container"
@@ -48,7 +48,7 @@ jobs:
 
   no-test:
     if: "!endsWith(github.base_ref, 'main')"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     steps:
       - run: |
           echo "Skip docs testing on non-main branches."
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index 7ac2781ef..8e837e71d 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.23"
+          ref: "2.24"
 
       - 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_23"
+        id: "create_pr_2_24"
         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.23"
-          branch: "update-ci/2.23"
-          base: "2.23"
+          title: "Update CI files for branch 2.24"
+          branch: "update-ci/2.24"
+          base: "2.24"
           delete-branch: true
       - name: "Mark PR automerge"
         working-directory: "pulp_container"
         run: |
-          gh pr merge --rebase --auto "${{ steps.create_pr_2_23.outputs.pull-request-number }}"
-        if: "steps.create_pr_2_23.outputs.pull-request-number"
+          gh pr merge --rebase --auto "${{ steps.create_pr_2_24.outputs.pull-request-number }}"
+        if: "steps.create_pr_2_24.outputs.pull-request-number"
         env:
           GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
diff --git a/CHANGES/domain-enablement.feature b/CHANGES/domain-enablement.feature
deleted file mode 100644
index d4bcfee5e..000000000
--- a/CHANGES/domain-enablement.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-Add partial support for Domains. The plugin can be installed with the feature turned on, but it
-only functions within the default domain.
diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py
index 72f75a444..b4e36b749 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.24.0.dev"
+    version = "2.25.0.dev"
     python_package_name = "pulp-container"
     domain_compatible = True
 
diff --git a/pyproject.toml b/pyproject.toml
index e4be796ba..4175925ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-container"
-version = "2.24.0.dev"
+version = "2.25.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.24.0.dev"
+current_version = "2.25.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 4b19af93a..f160fda23 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -23,7 +23,7 @@ docker_fixtures: false
 flake8: true
 flake8_ignore: []
 github_org: pulp
-latest_release_branch: '2.23'
+latest_release_branch: '2.24'
 lint_requirements: true
 os_required_packages: []
 parallel_test_workers: 8
@@ -58,9 +58,9 @@ pulp_settings_azure:
   flatpak_index: true
 pulp_settings_gcp: null
 pulp_settings_s3:
+  domain_enabled: true
   flatpak_index: false
   token_auth_disabled: true
-  domain_enabled: true
 pydocstyle: true
 release_email: pulp-infra@redhat.com
 release_user: pulpbot