diff --git a/.backstage/catalog-info.yaml b/.backstage/catalog-info.yaml
index f8ca4ab67..871da23f2 100644
--- a/.backstage/catalog-info.yaml
+++ b/.backstage/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Location
 metadata:
@@ -7,10 +8,12 @@ spec:
   type: url
   targets:
     - https://github.com/tyriis/home-ops/blob/main/.backstage/domains/home/catalog-info.yaml
-    - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/talos-flux/catalog-info.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/kube-nas/catalog-info.yaml
+    - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/mqtt.home/catalog-info.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/nas/catalog-info.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/opnsense/catalog-info.yaml
+    - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/talos-flux/catalog-info.yaml
+    - https://github.com/tyriis/home-ops/blob/main/.backstage/systems/talos-flux/zigbee-bridge.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/components/cert-manager/catalog-info.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/components/node-red/catalog-info.yaml
     - https://github.com/tyriis/home-ops/blob/main/.backstage/components/rook-ceph/catalog-info.yaml
diff --git a/.backstage/components/cert-manager/catalog-info.yaml b/.backstage/components/cert-manager/catalog-info.yaml
index f11060a33..7e9c879bd 100644
--- a/.backstage/components/cert-manager/catalog-info.yaml
+++ b/.backstage/components/cert-manager/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/.backstage/components/node-red/catalog-info.yaml b/.backstage/components/node-red/catalog-info.yaml
index cd11feac6..ef38a8e92 100644
--- a/.backstage/components/node-red/catalog-info.yaml
+++ b/.backstage/components/node-red/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/.backstage/components/rook-ceph/catalog-info.yaml b/.backstage/components/rook-ceph/catalog-info.yaml
index d9492f092..e77681ece 100644
--- a/.backstage/components/rook-ceph/catalog-info.yaml
+++ b/.backstage/components/rook-ceph/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/.backstage/components/traefik-forward-auth/catalog-info.yaml b/.backstage/components/traefik-forward-auth/catalog-info.yaml
index b9d62f47f..42ce17507 100644
--- a/.backstage/components/traefik-forward-auth/catalog-info.yaml
+++ b/.backstage/components/traefik-forward-auth/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/.backstage/components/traefik/catalog-info.yaml b/.backstage/components/traefik/catalog-info.yaml
index 48260a803..a82f649f8 100644
--- a/.backstage/components/traefik/catalog-info.yaml
+++ b/.backstage/components/traefik/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
diff --git a/.backstage/domains/home/catalog-info.yaml b/.backstage/domains/home/catalog-info.yaml
index 39544a416..88aa894f0 100644
--- a/.backstage/domains/home/catalog-info.yaml
+++ b/.backstage/domains/home/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: Domain
 metadata:
diff --git a/.backstage/systems/mqtt.home/catalog-info.yaml b/.backstage/systems/mqtt.home/catalog-info.yaml
new file mode 100644
index 000000000..d142c351c
--- /dev/null
+++ b/.backstage/systems/mqtt.home/catalog-info.yaml
@@ -0,0 +1,21 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: mqtt.home
+  description: raspberry pi mosquitto mqtt broker
+  annotations:
+    # backstage.io/techdocs-ref: dir:.
+    github.com/project-slug: tyriis/home-ops
+  tags:
+    - raspberry-pi
+    - messaging
+    - iot
+    - mqtt
+spec:
+  owner: home-ops
+  domain: home
+  type: infrastructure
+  lifecycle: production
+  system: mqtt-broker
diff --git a/.backstage/systems/talos-flux/catalog-info.yaml b/.backstage/systems/talos-flux/catalog-info.yaml
index 1117cc3a2..70f4a50f4 100644
--- a/.backstage/systems/talos-flux/catalog-info.yaml
+++ b/.backstage/systems/talos-flux/catalog-info.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
 apiVersion: backstage.io/v1alpha1
 kind: System
 metadata:
diff --git a/.backstage/systems/zigbee-bridge/catalog-info.yaml b/.backstage/systems/zigbee-bridge/catalog-info.yaml
new file mode 100644
index 000000000..403aa9a33
--- /dev/null
+++ b/.backstage/systems/zigbee-bridge/catalog-info.yaml
@@ -0,0 +1,20 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: zigbee-bridge
+  description: raspberry pi 2 zigbee-bridge
+  annotations:
+    # backstage.io/techdocs-ref: dir:.
+    github.com/project-slug: tyriis/home-ops
+  tags:
+    - raspberry-pi
+    - zigbee
+    - bridge
+spec:
+  owner: home-ops
+  domain: home
+  type: infrastructure
+  lifecycle: production
+  system: zigbee-bridge