diff --git a/cockpit/menu_override/networkmanager.override.json b/cockpit/menu_override/networkmanager.override.json
index 9ca218d3..90244aac 100644
--- a/cockpit/menu_override/networkmanager.override.json
+++ b/cockpit/menu_override/networkmanager.override.json
@@ -1,57 +1,7 @@
 {
-    "menu": null,
-    "tools": {
-        "index": {
-            "label": "Networking",
-            "order": 40,
-            "docs": [
-                {
-                    "label": "Managing networking bonds",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing networking teams",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing networking bridges",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing VLANs",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing firewall",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing_firewall_using_the_web_console"
-                }
-            ],
-            "keywords": [
-                {
-                    "matches": [
-                        "network",
-                        "interface",
-                        "bridge",
-                        "vlan",
-                        "bond",
-                        "team",
-                        "port",
-                        "mac",
-                        "ipv4",
-                        "ipv6"
-                    ]
-                },
-                {
-                    "matches": [
-                        "firewall",
-                        "firewalld",
-                        "zone",
-                        "tcp",
-                        "udp"
-                    ],
-                    "goto": "/network/firewall"
-                }
-            ]
-        }
-    }
-}
\ No newline at end of file
+    "name": "network",
+    "conditions": [
+        {"path-exists": "/usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf"}
+    ],
+    "menu": null
+}
diff --git a/cockpit/menu_override/storaged.override.json b/cockpit/menu_override/storaged.override.json
index 726a9ccc..ccbf5ad3 100644
--- a/cockpit/menu_override/storaged.override.json
+++ b/cockpit/menu_override/storaged.override.json
@@ -1,69 +1,11 @@
 {
-    "menu": null,
-    "tools": {
-        "index": {
-            "label": "Storage",
-            "order": 30,
-            "docs": [
-                {
-                    "label": "Managing partitions",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing NFS mounts",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing RAIDs",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing LVMs",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/using-the-web-console-for-configuring-lvm-logical-volumes_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing physical drives",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/using-the-web-console-for-changing-physical-drives-in-volume-groups_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Managing VDOs",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/using-the-web-console-for-managing-virtual-data-optimizer-volumes_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Using LUKS encryption",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/locking-data-with-luks-password-in-the-rhel-web-console_system-management-using-the-rhel-8-web-console"
-                },
-                {
-                    "label": "Using Tang server",
-                    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-automated-unlocking-using-a-tang-key-in-the-web-console_system-management-using-the-rhel-8-web-console"
-                }
-            ],
-            "keywords": [
-                {
-                    "matches": [
-                        "filesystem",
-                        "partition",
-                        "nfs",
-                        "raid",
-                        "volume",
-                        "disk",
-                        "vdo",
-                        "iscsi",
-                        "drive",
-                        "mount",
-                        "unmount",
-                        "udisks",
-                        "mkfs",
-                        "format",
-                        "fstab",
-                        "lvm2",
-                        "luks",
-                        "encryption",
-                        "nbde",
-                        "tang"
-                    ]
-                }
-            ]
-        }
-    }
-}
\ No newline at end of file
+    "name": "storage",
+    "requires": {
+        "cockpit": "266"
+    },
+    "conditions": [
+        {"path-exists": "/usr/share/dbus-1/system.d/org.freedesktop.UDisks2.conf"}
+    ],
+
+    "menu": null
+}