diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml
index f96e8075..1a610537 100644
--- a/.github/workflows/test-matrix.yml
+++ b/.github/workflows/test-matrix.yml
@@ -19,8 +19,6 @@ jobs:
         - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, visual name, tox env]
-        - ["3.13", "6.2 on py3.13", "py313-plone62"]
-        - ["3.10", "6.2 on py3.10", "py310-plone62"]
         - ["3.13", "6.1 on py3.13", "py313-plone61"]
         - ["3.10", "6.1 on py3.10", "py310-plone61"]
         - ["3.9", "6.0 on py3.9", "py39-plone60"]
@@ -30,7 +28,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Set up Python
@@ -38,8 +36,16 @@ jobs:
       with:
         python-version: ${{ matrix.config[0] }}
         allow-prereleases: true
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines_after_os_dependencies = """
+#  _your own configuration lines_
+#  """
+##
     - name: Pip cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
@@ -57,3 +63,12 @@ jobs:
         if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
     - name: Test
       run: tox -e ${{ matrix.config[2] }}
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##
diff --git a/.meta.toml b/.meta.toml
index 81f3ac3c..ca85faa4 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -3,9 +3,10 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.3.3.dev0"
 
 [pyproject]
-dependencies_mappings = [
-    "'Products.ZCatalog' = ['Products.ZCTextIndex']",
-    ]
+dependencies_mappings = ["'Products.ZCatalog' = ['Products.ZCTextIndex']"]
+
+[tox]
+test_matrix = { "6.1" = ["3.13", "3.10"], "6.0" = ["3.13", "3.9"] }
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0b63ae5f..26c3c6fa 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.0
+    rev: v3.21.2
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -16,7 +16,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.9.0
+    rev: 25.12.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -62,16 +62,16 @@ repos:
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
-    rev: "5.0"
+    rev: "5.0.1"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.23.0"
+    rev: "0.24.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.2.1"
+    rev: "6.3.0"
     hooks:
     -   id: i18ndude
 
diff --git a/news/+meta.internal b/news/+meta.internal
new file mode 100644
index 00000000..c08f5399
--- /dev/null
+++ b/news/+meta.internal
@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]
diff --git a/setup.py b/setup.py
index 72205c06..effee084 100644
--- a/setup.py
+++ b/setup.py
@@ -20,13 +20,15 @@
         "Development Status :: 5 - Production/Stable",
         "Framework :: Plone",
         "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "Framework :: Plone :: Core",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
     keywords="collection queries",
     author="Plone Foundation",
@@ -38,7 +40,7 @@
     namespace_packages=["plone", "plone.app"],
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     install_requires=[
         "setuptools",
         "plone.app.contentlisting",
diff --git a/tox.ini b/tox.ini
index af9a63a5..86c73931 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,18 +7,9 @@ min_version = 4.4.0
 envlist =
     lint
     test
-    py313-plone62
-    py312-plone62
-    py311-plone62
-    py310-plone62
     py313-plone61
-    py312-plone61
-    py311-plone61
     py310-plone61
     py313-plone60
-    py312-plone60
-    py311-plone60
-    py310-plone60
     py39-plone60
     dependencies
 
@@ -26,10 +17,12 @@ envlist =
 ##
 # Add extra configuration options in .meta.toml:
 # - to specify a custom testing combination of Plone and python versions, use `test_matrix`
+#   Use ["*"] to use all supported Python versions for this Plone version.
+# - to disable the test matrix entirely, set `use_test_matrix = false`
 # - to specify extra custom environments, use `envlist_lines`
 # - to specify extra `tox` top-level options, use `config_lines`
 #  [tox]
-#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
+#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
 #  envlist_lines = """
 #      my_other_environment
 #  """
@@ -70,6 +63,7 @@ description = check if the package defines all its dependencies
 skip_install = true
 deps =
     build
+    setuptools<82.0.0
     z3c.dependencychecker==2.14.3
 commands =
     python -m build --sdist
@@ -118,7 +112,6 @@ set_env =
 ##
 deps =
     {[test_runner]deps}
-    plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
     plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
     plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt
 
@@ -140,6 +133,7 @@ extras =
 ##
 # Add extra configuration options in .meta.toml:
 #  [tox]
+#  skip_test_extra = true
 #  test_extras = """
 #      tests
 #      widgets
@@ -160,7 +154,7 @@ constrain_package_deps = {[base]constrain_package_deps}
 set_env = {[base]set_env}
 deps =
     {[test_runner]deps}
-    -c https://dist.plone.org/release/6.2-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands = {[test_runner]test}
 extras = {[base]extras}
@@ -186,7 +180,7 @@ set_env = {[base]set_env}
 deps =
     {[test_runner]deps}
     coverage
-    -c https://dist.plone.org/release/6.2-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands = {[test_runner]coverage}
 extras = {[base]extras}
@@ -199,8 +193,7 @@ deps =
     twine
     build
     towncrier
-    -c https://dist.plone.org/release/6.2-dev/constraints.txt
-
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
@@ -230,8 +223,7 @@ allowlist_externals =
 deps =
     pipdeptree
     pipforester
-    -c https://dist.plone.org/release/6.2-dev/constraints.txt
-
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'