diff --git a/etc/kayobe/kolla/config/horizon/_9999-custom-settings.py b/etc/kayobe/kolla/config/horizon/_9999-custom-settings.py
new file mode 100644
index 0000000000..f27c222a95
--- /dev/null
+++ b/etc/kayobe/kolla/config/horizon/_9999-custom-settings.py
@@ -0,0 +1 @@
+SYSTEM_SCOPE_SERVICES = ['ironic']
diff --git a/etc/kayobe/kolla/config/ironic/policy.yaml b/etc/kayobe/kolla/config/ironic/policy.yaml
index e37f33113a..b0ea552667 100644
--- a/etc/kayobe/kolla/config/ironic/policy.yaml
+++ b/etc/kayobe/kolla/config/ironic/policy.yaml
@@ -4,4 +4,4 @@
 # GET  /nodes/detail
 # Intended scope(s): system, project
 # Overridden: added role:admin
-"baremetal:node:list_all": "role:admin or (role:reader and system_scope:all) or (role:service and system_scope:all) or rule:service_role"
+"baremetal:node:list_all": "role:baremetal_node_list_all or (role:reader and system_scope:all) or (role:service and system_scope:all) or rule:service_role"
diff --git a/releasenotes/notes/fix-ironic-horizon-integration-c844d19bd36ed014.yaml b/releasenotes/notes/fix-ironic-horizon-integration-c844d19bd36ed014.yaml
new file mode 100644
index 0000000000..f743cf9322
--- /dev/null
+++ b/releasenotes/notes/fix-ironic-horizon-integration-c844d19bd36ed014.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Users with the admin role can no longer list all baremetal nodes by
+    default. Please assign any users that want this functionality the
+    ``baremetal_node_list_all`` role.
+  - |
+    Fixes Horizon Ironic integration which was broken by custom policy.