diff --git a/news/+cleanup-resource-registry.feature.rst b/news/+cleanup-resource-registry.feature.rst
new file mode 100644
index 00000000..b586903f
--- /dev/null
+++ b/news/+cleanup-resource-registry.feature.rst
@@ -0,0 +1,2 @@
+7.0: Remove remaining deprecated Plone 5 resource registry records.
+[thet]
diff --git a/src/plone/app/upgrade/configure.zcml b/src/plone/app/upgrade/configure.zcml
index 77b04844..d25d3d8b 100644
--- a/src/plone/app/upgrade/configure.zcml
+++ b/src/plone/app/upgrade/configure.zcml
@@ -18,6 +18,10 @@
       package=".v62"
       zcml:condition="have plone-62"
       />
+  <include
+      package=".v70"
+      zcml:condition="have plone-70"
+      />
 
   <utility
       factory=".HiddenProducts"
diff --git a/src/plone/app/upgrade/v70/__init__.py b/src/plone/app/upgrade/v70/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/plone/app/upgrade/v70/alpha.py b/src/plone/app/upgrade/v70/alpha.py
new file mode 100644
index 00000000..bea9735a
--- /dev/null
+++ b/src/plone/app/upgrade/v70/alpha.py
@@ -0,0 +1,37 @@
+from plone.registry.interfaces import IRegistry
+from zope.component import getUtility
+
+import logging
+import re
+
+logger = logging.getLogger(__name__)
+
+
+def cleanup_resource_registry(self):
+    """Remove remaining deprecated Plone 5 resource registry records."""
+    # Regex for deprecated resource registry keys.
+    resource_regex = re.compile(
+        r"plone.bundles.*("
+        "compile|"
+        "develop_css|"
+        "develop_javascript|"
+        "last_compilation|"
+        "merge_with|"
+        "resources|"
+        "stub_js_modules"
+        ")"
+    )
+    registry = getUtility(IRegistry)
+
+    # Create a static list of registry keys to not operate on a live iterator
+    # which changes size when deleting keys.
+    keys = list(registry.records.keys())
+    for key in keys:
+        # Remove "plone.resources/*", "plone.lessvariables" and deprecated bundle keys.
+        if (
+            "plone.resources/" == key[:16]
+            or key == "plone.lessvariables"
+            or resource_regex.match(key)
+        ):
+            del registry.records[key]
+            logger.info("Removed deprecated registry record %s.", key)
diff --git a/src/plone/app/upgrade/v70/configure.zcml b/src/plone/app/upgrade/v70/configure.zcml
new file mode 100644
index 00000000..adc347c3
--- /dev/null
+++ b/src/plone/app/upgrade/v70/configure.zcml
@@ -0,0 +1,18 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    i18n_domain="plone"
+    >
+
+  <gs:upgradeSteps
+      profile="Products.CMFPlone:plone"
+      source="6299"
+      destination="7000"
+      >
+    <gs:upgradeStep
+        title="Cleanup resource registry"
+        handler=".alpha.cleanup_resource_registry"
+        />
+  </gs:upgradeSteps>
+
+</configure>