diff --git a/versions.cfg b/versions.cfg
index bd9aa0b35f..321ac9643e 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -7,7 +7,7 @@
 # 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.3/versions.cfg
+extends = https://zopefoundation.github.io/Zope/releases/5.8.4/versions.cfg
 
 
 [versions]
@@ -22,8 +22,6 @@ zc.buildout = 3.0.1
 nt-svcutils = 2.13.0
 
 # OVERRIDES
-AccessControl = 6.2
-RestrictedPython = 6.2
 
 # CORE PLONE.
 # These packages are what you get when installing Plone plus test dependencies,
@@ -262,11 +260,7 @@ pkgutil-resolve-name = 1.3.10
 
 [versionannotations]
 # keep this alphabetical please
-AccessControl =
-    6.2 has security fixes
 prompt-toolkit =
     Requirement of robotframework-debuglibrary: prompt-toolkit<3,>=2
-RestrictedPython =
-    6.2 has security fixes
 selenium =
     robotframework-seleniumlibrary 6.1.0 is incompatible with 4.10.0. See https://github.com/robotframework/SeleniumLibrary/issues/1835