diff --git a/.github/workflows/run-buildout.yml b/.github/workflows/run-buildout.yml
index b5f57a9b3f..60d744390c 100644
--- a/.github/workflows/run-buildout.yml
+++ b/.github/workflows/run-buildout.yml
@@ -11,6 +11,7 @@ jobs:
         - "3.9"
         - "3.10"
         - "3.11"
+        - "3.12"
         os:
         - ubuntu-latest
         - windows-latest
diff --git a/requirements.txt b/requirements.txt
index ff1a182109..7be61bbdbd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-pip==23.2
-setuptools==68.0.0
-wheel==0.40.0
+pip==23.3.1
+setuptools==68.2.2
+wheel==0.41.2
 zc.buildout==3.0.1
 
 # Windows specific down here (has to be installed here, fails in buildout)
diff --git a/sources.cfg b/sources.cfg
index 1765c03f74..7fc5cdd124 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -116,14 +116,14 @@ plone.releaser                      = git ${remotes:plone}/plone.releaser.git pu
 plone.reload                        = git ${remotes:plone}/plone.reload.git pushurl=${remotes:plone_push}/plone.reload.git branch=master
 plone.resource                      = git ${remotes:plone}/plone.resource.git pushurl=${remotes:plone_push}/plone.resource.git branch=master
 plone.resourceeditor                = git ${remotes:plone}/plone.resourceeditor.git pushurl=${remotes:plone_push}/plone.resourceeditor.git branch=master
-plone.rest                          = git ${remotes:plone}/plone.rest.git pushurl=${remotes:plone_push}/plone.rest.git branch=master
-plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=8.x.x
+plone.rest                          = git ${remotes:plone}/plone.rest.git pushurl=${remotes:plone_push}/plone.rest.git branch=main
+plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=main
 plone.rfc822                        = git ${remotes:plone}/plone.rfc822.git pushurl=${remotes:plone_push}/plone.rfc822.git branch=master
 plone.scale                         = git ${remotes:plone}/plone.scale.git pushurl=${remotes:plone_push}/plone.scale.git branch=master
 plone.schema                        = git ${remotes:plone}/plone.schema.git pushurl=${remotes:plone_push}/plone.schema.git branch=master
 plone.schemaeditor                  = git ${remotes:plone}/plone.schemaeditor.git pushurl=${remotes:plone_push}/plone.schemaeditor.git branch=master
 plone.session                       = git ${remotes:plone}/plone.session.git pushurl=${remotes:plone_push}/plone.session.git branch=master
-plone.staticresources               = git ${remotes:plone}/plone.staticresources.git pushurl=${remotes:plone_push}/plone.staticresources.git branch=master
+plone.staticresources               = git ${remotes:plone}/plone.staticresources.git pushurl=${remotes:plone_push}/plone.staticresources.git branch=2.1.x
 plone.stringinterp                  = git ${remotes:plone}/plone.stringinterp.git pushurl=${remotes:plone_push}/plone.stringinterp.git branch=master
 plone.subrequest                    = git ${remotes:plone}/plone.subrequest.git pushurl=${remotes:plone_push}/plone.subrequest.git branch=master
 plone.supermodel                    = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git branch=master
@@ -135,7 +135,7 @@ plone.uuid                          = git ${remotes:plone}/plone.uuid.git pushur
 plone.versioncheck                  = git ${remotes:plone}/plone.versioncheck.git pushurl=${remotes:plone_push}/plone.versioncheck.git branch=master
 plone.volto                         = git ${remotes:plone}/plone.volto.git pushurl=${remotes:plone_push}/plone.volto.git branch=main
 plone.z3cform                       = git ${remotes:plone}/plone.z3cform.git pushurl=${remotes:plone_push}/plone.z3cform.git branch=master
-plonetheme.barceloneta              = git ${remotes:plone}/plonetheme.barceloneta.git pushurl=${remotes:plone_push}/plonetheme.barceloneta.git branch=master
+plonetheme.barceloneta              = git ${remotes:plone}/plonetheme.barceloneta.git pushurl=${remotes:plone_push}/plonetheme.barceloneta.git branch=3.1.x
 Products.CMFCore                    = git ${remotes:zope}/Products.CMFCore.git pushurl=${remotes:zope_push}/Products.CMFCore.git branch=master
 Products.CMFDiffTool                = git ${remotes:plone}/Products.CMFDiffTool.git pushurl=${remotes:plone_push}/Products.CMFDiffTool.git branch=master
 Products.CMFDynamicViewFTI          = git ${remotes:plone}/Products.CMFDynamicViewFTI.git pushurl=${remotes:plone_push}/Products.CMFDynamicViewFTI.git branch=master
diff --git a/versions-ecosystem.cfg b/versions-ecosystem.cfg
index 9b88d3fc8b..fc3aad4e27 100644
--- a/versions-ecosystem.cfg
+++ b/versions-ecosystem.cfg
@@ -9,7 +9,7 @@ plone.app.blocks = 7.0.0
 plone.app.debugtoolbar = 1.3.0
 plone.app.drafts = 2.0.0
 plone.app.jquerytools = 1.9.5
-plone.app.mosaic = 3.1.4
+plone.app.mosaic = 3.1.5
 plone.app.standardtiles = 3.1.2
 plone.app.tiles = 4.0.0
 plone.formwidget.autocomplete = 1.4.1
diff --git a/versions-extra.cfg b/versions-extra.cfg
index 3ec0de8e1a..b77880d821 100644
--- a/versions-extra.cfg
+++ b/versions-extra.cfg
@@ -3,15 +3,14 @@
 # that pull in ever more dependencies.
 # Note: version pins in this file can be removed at any time.
 [versions]
-argcomplete = 3.1.1
-argh = 0.28.1
-bleach = 6.0.0
-build = 0.10.0
+argcomplete = 3.1.2
+argh = 0.30.2
+bleach = 6.1.0
+build = 1.0.3
 cachecontrol = 0.13.1
 cached-property = 1.5.2
 check-manifest = 0.49
-click = 8.1.4
-click-default-group = 1.2.2
+click-default-group = 1.2.4
 cmarkgfm = 2022.10.27
 colorama = 0.4.6
 commonmark = 0.9.1
@@ -19,9 +18,10 @@ configparser = 5.3.0
 Deprecated = 1.2.14
 distro = 1.8.0
 fancycompleter = 0.9.1
-filelock = 3.12.2
-gitdb = 4.0.10
-GitPython = 3.1.32
+filelock = 3.12.4
+gitdb = 4.0.11
+grpcio-tools = 1.59.0
+GitPython = 3.1.40
 httplib2 = 0.22.0
 i18ndude = 6.1.0
 incremental = 22.10.0
@@ -31,40 +31,40 @@ lockfile = 0.12.2
 markdown-it-py = 2.2.0
 mdurl = 0.1.2
 more-itertools = 9.1.0
-msgpack = 1.0.5
+msgpack = 1.0.7
 mxdev = 3.0.0
 oauthlib = 3.2.2
 pdbpp = 0.10.3
 pep440 = 0.1.2
 pep517 = 0.13.0
 pkginfo = 1.9.6
-plone.recipe.zeoserver = 3.0.0
+plone.recipe.zeoserver = 3.0.1
 plone.releaser = 2.1.1
 plone.reload = 3.0.2
 plone.versioncheck = 1.8.1
 progress = 1.6
-PyGithub = 1.59.0
+PyGithub = 1.59.1
 PyNaCl = 1.5.0
-pyparsing = 3.1.0
+pyparsing = 3.1.1
 pyproject-hooks = 1.0.0
 pyrepl = 0.9.0
 pyroma = 4.2
 readme-renderer = 40.0.0
 requests-toolbelt = 1.0.0
 rfc3986 = 2.0.0
-rich = 13.4.2
-smmap = 5.0.0
+rich = 13.6.0
+smmap = 5.0.1
 stdlib-list = 0.9.0
 tomli = 2.0.1
 towncrier = 23.6.0
-trove-classifiers = 2023.8.7
+trove-classifiers = 2023.10.18
 twine = 4.0.2
 wadllib = 1.3.6
 webencodings = 0.5.1
-wmctrl = 0.4
+wmctrl = 0.5
 z3c.dependencychecker = 2.12
 zest.pocompile = 2.0.0
-zest.releaser = 9.0.0
+zest.releaser = 9.1.1
 zestreleaser.towncrier = 1.3.0
 zodbverify = 1.2.0
 zope.mkzeoinstance = 5.1.1
diff --git a/versions.cfg b/versions.cfg
index 334e285d2e..3ca67aa807 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -7,15 +7,15 @@
 # Based on latest development Zope:
 # extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 # Based on released Zope:
-extends = https://zopefoundation.github.io/Zope/releases/5.8.5/versions.cfg
+extends = https://zopefoundation.github.io/Zope/releases/5.8.6/versions.cfg
 
 
 [versions]
 # Basics
 # !! keep in sync with requirements.txt !!
-pip = 23.2
-setuptools = 68.0.0
-wheel = 0.40.0
+pip = 23.3.1
+setuptools = 68.2.2
+wheel = 0.41.2
 zc.buildout = 3.0.1
 
 # windows specific
@@ -26,105 +26,105 @@ nt-svcutils = 2.13.0
 # CORE PLONE.
 # These packages are what you get when installing Plone plus test dependencies,
 # and are managed by the Plone community, not by Zope or others.
-borg.localrole = 3.1.10
+borg.localrole = 3.1.11
 diazo = 1.5.0
-five.intid = 1.2.7
+five.intid = 2.0.0
 Plone = 6.0.7
 plone.alterego = 2.0.0
-plone.api = 2.0.4
-plone.app.caching = 3.1.2
-plone.app.content = 4.0.2
-plone.app.contentlisting = 3.0.3
+plone.api = 2.0.5
+plone.app.caching = 3.1.3
+plone.app.content = 4.0.3
+plone.app.contentlisting = 3.0.4
 plone.app.contentmenu = 3.0.3
-plone.app.contentrules = 5.0.2
-plone.app.contenttypes = 3.0.3
-plone.app.customerize = 2.0.0
-plone.app.dexterity = 3.1.1
+plone.app.contentrules = 5.0.3
+plone.app.contenttypes = 3.0.5
+plone.app.customerize = 2.0.1
+plone.app.dexterity = 3.1.2
 plone.app.discussion = 4.0.2
-plone.app.event = 5.1.0
+plone.app.event = 5.1.1
 plone.app.i18n = 4.0.1
 plone.app.intid = 2.0.0
 plone.app.iterate = 5.0.2
 plone.app.layout = 4.0.7
-plone.app.linkintegrity = 4.0.2
-plone.app.locales = 6.0.16
-plone.app.lockingbehavior = 1.0.7
+plone.app.linkintegrity = 3.6.2
+plone.app.locales = 6.0.17
+plone.app.lockingbehavior = 2.0.0
 plone.app.multilingual = 7.0.3
 plone.app.portlets = 5.0.6
-plone.app.querystring = 2.0.6
+plone.app.querystring = 2.1.0
 plone.app.redirector = 3.0.1
-plone.app.registry = 2.0.2
+plone.app.registry = 2.0.3
 plone.app.relationfield = 3.0.3
-plone.app.robotframework = 2.1.0
+plone.app.robotframework = 2.1.1
 plone.app.testing = 7.0.1
 plone.app.textfield = 2.0.0
-plone.app.theming = 5.0.4
+plone.app.theming = 5.0.5
 plone.app.upgrade = 3.0.8
-plone.app.users = 3.0.3
+plone.app.users = 3.0.4
 plone.app.uuid = 2.2.2
 plone.app.versioningbehavior = 2.0.1
 plone.app.viewletmanager = 4.0.3
-plone.app.vocabularies = 5.0.3
+plone.app.vocabularies = 5.0.4
 plone.app.widgets = 5.0.0
-plone.app.workflow = 5.0.2
+plone.app.workflow = 5.0.3
 plone.app.z3cform = 4.3.0
 plone.autoform = 2.0.1
 plone.autoinclude = 1.0.1
-plone.base = 1.1.4
+plone.base = 1.2.0
 plone.batching = 2.0.6
 plone.behavior = 2.0.0
-plone.browserlayer = 3.0.1
-plone.cachepurging = 3.0.1
-plone.caching = 2.0.0
+plone.browserlayer = 3.0.2
+plone.cachepurging = 3.0.2
+plone.caching = 2.0.1
 plone.contentrules = 3.0.0
 plone.dexterity = 3.0.3
-plone.event = 2.0.0
+plone.event = 2.0.1
 plone.folder = 4.0.0
-plone.formwidget.namedfile = 3.0.2
+plone.formwidget.namedfile = 3.0.3
 plone.formwidget.recurrence = 3.0.3
-plone.i18n = 5.0.1
+plone.i18n = 5.0.2
 plone.indexer = 2.0.0
-plone.intelligenttext = 4.0.0
+plone.intelligenttext = 4.0.1
 plone.keyring = 4.0.0
 plone.locking = 3.0.0
 plone.memoize = 3.0.2
-plone.namedfile = 6.2.1
+plone.namedfile = 6.2.2
 plone.outputfilters = 5.0.4
 plone.portlet.collection = 4.0.3
 plone.portlet.static = 4.0.1
 plone.portlets = 3.0.0
 plone.protect = 5.0.0
-plone.recipe.zope2instance = 6.12.1
+plone.recipe.zope2instance = 6.12.2
 plone.registry = 2.0.0
 plone.resource = 3.0.0
-plone.resourceeditor = 4.0.0
-plone.rest = 3.0.1
-plone.restapi = 8.43.3
+plone.resourceeditor = 4.0.1
+plone.rest = 4.1.1
+plone.restapi = 9.1.0
 plone.rfc822 = 3.0.0
-plone.scale = 4.0.1
-plone.schema = 2.0.0
-plone.schemaeditor = 4.0.4
+plone.scale = 4.1.0
+plone.schema = 2.0.1
+plone.schemaeditor = 4.0.5
 plone.session = 4.0.4
-plone.staticresources = 2.1.7
+plone.staticresources = 2.1.8
 plone.stringinterp = 2.0.1
 plone.subrequest = 2.0.4
 plone.supermodel = 2.0.3
-plone.testing = 8.0.4
-plone.theme = 4.0.0
+plone.testing = 9.0.0
+plone.theme = 4.0.1
 plone.tiles = 2.3.1
 plone.transformchain = 3.0.0
 plone.uuid = 2.0.0
 plone.volto = 4.1.0
-plone.z3cform = 2.0.1
-plonetheme.barceloneta = 3.1.5
+plone.z3cform = 2.0.2
+plonetheme.barceloneta = 3.1.6
 Products.CMFDiffTool = 4.0.1
-Products.CMFDynamicViewFTI = 7.0.1
-Products.CMFEditions = 4.0.1
+Products.CMFDynamicViewFTI = 7.0.2
+Products.CMFEditions = 4.0.2
 Products.CMFPlacefulWorkflow = 3.0.3
 Products.CMFPlone = 6.0.7
 Products.ExtendedPathIndex = 4.0.1
 Products.isurlinportal = 2.0.1
-Products.MimetypesRegistry = 3.0.0
+Products.MimetypesRegistry = 3.0.1
 Products.PlonePAS = 8.0.2
 Products.PortalTransforms = 4.0.1
 Products.statusmessages = 5.0.6
@@ -138,7 +138,7 @@ collective.monkeypatcher = 1.2.1
 collective.recipe.omelette = 1.1.0
 collective.recipe.vscode = 0.1.9
 collective.xmltestreport = 2.0.2
-icalendar = 5.0.7
+icalendar = 5.0.10
 Products.DateRecurringIndex = 3.0.1
 robotsuite = 2.3.2
 
@@ -148,7 +148,7 @@ robotsuite = 2.3.2
 # which are close to Plone.
 five.customerize = 2.1.0
 Products.CMFCore = 3.2
-Products.CMFUid = 4.0
+Products.CMFUid = 4.1
 Products.DCWorkflow = 3.0
 Products.ExternalMethod = 5.0
 Products.GenericSetup = 3.0.1
@@ -164,7 +164,7 @@ repoze.xmliter = 0.6.1
 z3c.caching = 3.0
 z3c.form = 4.3
 z3c.formwidget.query = 2.0.0
-z3c.objpath = 1.3
+z3c.objpath = 2.0
 z3c.relationfield = 1.0
 z3c.zcmlhook = 2.0
 zc.relation = 2.0
@@ -172,13 +172,13 @@ zdaemon = 5.0
 ZEO = 5.4.1
 ZODB3 = 3.11.0
 zodbupdate = 2.0
-zope.app.locales = 4.3
+zope.app.locales = 5.0
 zope.componentvocabulary = 2.3.0
 zope.copy = 4.3
 zope.intid = 5.0
 zope.keyreference = 6.0
 zope.ramcache = 3.0
-zope.sendmail = 5.3
+zope.sendmail = 6.0
 
 # CORE DEPENDENCIES: other
 # These packages are what you get when installing Plone and its tests,
@@ -186,10 +186,11 @@ zope.sendmail = 5.3
 async-generator = 1.10
 attrs = 23.1.0
 backports.cached-property = 1.0.2
-cryptography = 41.0.3
+cryptography = 41.0.5
+click = 8.1.7
 cssselect = 1.2.0
 decorator = 5.1.1
-exceptiongroup = 1.1.2
+exceptiongroup = 1.1.3
 feedparser = 6.0.10
 furl = 2.1.3
 future = 0.18.3
@@ -197,12 +198,12 @@ gunicorn = 20.1.0
 h11 = 0.14.0
 importlib-metadata = 6.8.0
 importlib-resources = 5.13.0
-jsonschema = 4.18.2
-jsonschema-specifications = 2023.6.1
+jsonschema = 4.18.6
+jsonschema-specifications = 2023.7.1
 jeepney = 0.8.0
 lxml = 4.9.3
 manuel = 1.12.4
-Markdown = 3.4.3
+Markdown = 3.4.4
 mock = 5.1.0
 orderedmultidict = 1.0.1
 outcome = 1.2.0
@@ -217,42 +218,41 @@ pyrsistent = 0.19.3
 PySocks = 1.7.1
 python-dateutil = 2.8.2
 python-dotenv = 1.0.0
-PyYAML = 6.0
-referencing = 0.29.1
-responses = 0.23.1
+PyYAML = 6.0.1
+referencing = 0.29.3
+responses = 0.23.3
 robotframework = 6.0.2
 # robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0,
 # but https://github.com/robocorp/robotframework-lsp/issues/947
 robotframework-lsp = 1.10.1
-robotframework-assertion-engine = 1.0.0
-robotframework-browser = 16.2.0
+robotframework-assertion-engine = 2.0.0
+robotframework-browser = 17.5.2
 robotframework-debuglibrary = 2.3.0
-robotframework-pythonlibcore = 4.1.2
+robotframework-pythonlibcore = 4.2.0
 robotframework-selenium2library = 3.0.0
 robotframework-selenium2screenshots = 0.8.1
 robotframework-seleniumlibrary = 6.1.0
 robotframework-seleniumtestability = 2.1.0
-rpds-py = 0.8.10
+rpds-py = 0.8.12
 SecretStorage = 3.3.3
 selenium = 4.9.1
 sgmllib3k = 1.0.0
-simplejson = 3.19.1
+simplejson = 3.19.2
 sniffio = 1.3.0
 sortedcontainers = 2.4.0
 toml = 0.10.2
 trio = 0.22.2
-trio-websocket = 0.10.3
+trio-websocket = 0.10.4
 types-PyYAML = 6.0.12.10
 types-toml = 0.10.8.5
 typing-extensions = 4.7.1
-Unidecode = 1.3.6
+Unidecode = 1.3.7
 urllib3-secure-extra = 0.1.0
 watchdog = 3.0.0
-wcwidth = 0.2.6
+wcwidth = 0.2.8
 webresource = 1.2
 wrapt = 1.15.0
 wsproto = 1.2.0
-zipp = 3.16.1
 
 [versions:python38]
 backports.zoneinfo = 0.2.1