diff --git a/checkouts.cfg b/checkouts.cfg
index 6a39c42755..50714bde51 100644
--- a/checkouts.cfg
+++ b/checkouts.cfg
@@ -10,6 +10,7 @@ auto-checkout =
     plone.app.upgrade
     Products.CMFPlone
 # These packages are manually added, or automatically added by mr.roboto:
+    Zope
     plone.releaser
     plone.app.vocabularies
     plone.app.event
diff --git a/versions.cfg b/versions.cfg
index a6cccfd6aa..9f2c95ed73 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -5,9 +5,9 @@
 # Note: version pins in this file should only be removed in a new minor version of Plone.
 
 # Based on latest development Zope:
-# extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
+extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 # Based on released Zope:
-extends = https://zopefoundation.github.io/Zope/releases/5.8.4/versions.cfg
+# extends = https://zopefoundation.github.io/Zope/releases/5.8.4/versions.cfg
 
 
 [versions]
@@ -22,7 +22,6 @@ zc.buildout = 3.0.1
 nt-svcutils = 2.13.0
 
 # OVERRIDES
-certifi = 2023.7.22
 
 # CORE PLONE.
 # These packages are what you get when installing Plone plus test dependencies,