diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
index 2d8d709cae..b759af34a7 100755
--- a/.github/workflows/scripts/before_install.sh
+++ b/.github/workflows/scripts/before_install.sh
@@ -55,7 +55,7 @@ pulp_scheme: "https"
 image:
   name: "pulp"
   tag: "ci_build"
-  ci_base: "ghcr.io/pulp/pulp-ci-centos9:latest"
+  ci_base: "ghcr.io/pulp/pulp-ci-centos10:latest"
   source: "${COMPONENT_SOURCE}"
   ci_requirements: $(test -f ci_requirements.txt && echo -n true || echo -n false)
   upperbounds: $(test "${TEST}" = "pulp" && echo -n true || echo -n false)
diff --git a/MANIFEST.in b/MANIFEST.in
index 862f03cc35..fdda5e340f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,4 +17,5 @@ include test_requirements.txt
 exclude releasing.md
 exclude AGENTS.md
 exclude CLAUDE.md
+exclude Makefile
 recursive-exclude pulpcore/tasking/task_trigger_demonstration *
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..b4228e5ba2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --ci pulpcore' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+.PHONY: format
+format:
+	ruff format
+	ruff check --select I --fix
+
+.PHONY: lint
+lint:
+	yamllint -s -d '{extends: relaxed, rules: {line-length: disable}}' .github/workflows
+	bump-my-version bump --dry-run --allow-dirty release
+	ruff format --check --diff
+	ruff check
+	check-manifest
+	python .ci/scripts/check_requirements.py
diff --git a/pulpcore/tests/functional/api/using_plugin/test_content_delivery.py b/pulpcore/tests/functional/api/using_plugin/test_content_delivery.py
index 521bc05225..c4e4ade0d7 100644
--- a/pulpcore/tests/functional/api/using_plugin/test_content_delivery.py
+++ b/pulpcore/tests/functional/api/using_plugin/test_content_delivery.py
@@ -154,7 +154,7 @@ def test_remote_content_changed_with_on_demand(
     # THEN
     assert not output_file.exists()
     assert result.returncode == 18
-    assert b"* Closing connection 0" in result.stderr
+    assert b"closing connection" in result.stderr.lower()
     assert b"curl: (18) transfer closed with outstanding read data remaining" in result.stderr
 
     # WHEN (second request)
diff --git a/pyproject.toml b/pyproject.toml
index 469d3660f1..8be1e4cd3c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ dependencies = [
   "protobuf>=4.21.1,<8.0",
   "pulp-glue>=0.30.0,<0.41",
   "pygtrie>=2.5,<=2.5.0",
-  "psycopg[binary]>=3.1.8,<3.4",  # SemVer, not explicitely stated, but mentioned on multiple changes.
+  "psycopg[binary]>=3.3.4,<3.4",  # SemVer, not explicitely stated, but mentioned on multiple changes.
   "pyparsing>=3.1.0,<3.4",    # Looks like only bugfixes in z-Stream.
   "pysequoia>=0.1.33,<0.2",
   "PyYAML>=5.1.1,<6.1",  # Looks like only bugfixes in z-Stream.
diff --git a/template_config.yml b/template_config.yml
index 8c44961ba2..cbdfdcda7e 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -9,7 +9,7 @@
 check_commit_message: true
 check_manifest: true
 check_stray_pulpcore_imports: false
-ci_base_image: "ghcr.io/pulp/pulp-ci-centos9"
+ci_base_image: "ghcr.io/pulp/pulp-ci-centos10"
 ci_env: {}
 ci_trigger: "{pull_request: {branches: ['*']}}"
 cli_package: "pulp-cli"