diff --git a/catalog-info.yaml b/catalog-info.yaml
index 2f0ba68b..4e76d5bd 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -1,26 +1,12 @@
-# Catalog entry for Backstage [backstage.io]
 apiVersion: backstage.io/v1alpha1
-kind: Component
+kind: Location
 metadata:
-  name: broker
-  title: Broker
-  description: The infrastructure middleman!
-  links:
-    - title: PyPi
-      url: https://pypi.org/project/broker
-  tags:
-    - python
-    - infrastructure
-    - click
-    - ansible-tower
-    - aap
-    - docker
-    - podman
-  namespace: quality-community   
-  annotations:
-    github.com/project-slug: SatelliteQE/broker
-    backstage.io/techdocs-ref: https://github.com/SatelliteQE/broker/wiki
+  name: qe-broker-root-config
+  title: QE Broker Root Configuration
+  namespace: quality-community
+  description: A root collection of all QE Broker configurations for Backstage.
 spec:
-  type: library
-  owner: group:redhat/satellite-qe
-  lifecycle: preproduction
+  owner: group:redhat/quality-community
+  targets:
+    - ./catalog/system/broker.yaml
+
diff --git a/catalog/system/broker.yaml b/catalog/system/broker.yaml
new file mode 100644
index 00000000..0e898019
--- /dev/null
+++ b/catalog/system/broker.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: broker
+  title: Broker
+  namespace: quality-community
+  description: The infrastructure middleman!
+  annotations:
+    github.com/project-slug: 'SatelliteQE/broker'
+  tags:
+    - python
+    - infrastructure
+    - click
+    - ansible-tower
+    - aap
+    - docker
+    - podman
+  links:
+    - title: PyPi
+      url: https://pypi.org/project/broker
+spec:
+  owner: group:redhat/satellite-qe
+  domain: quality-community/quality-community
+