diff --git a/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml b/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
index 175ffb45b..fceae03f4 100644
--- a/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
+++ b/clusters/cl01tl/services/external-dns/templates/dns-endpoint.yaml
@@ -95,6 +95,12 @@ metadata:
     app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   endpoints:
+    # Unifi Gateway
+    - dnsName: nw01un.alexlebens.net
+      recordTTL: 180
+      recordType: A
+      targets:
+        - 192.168.1.1
     # Synology
     - dnsName: ps02sn.alexlebens.net
       recordTTL: 180
@@ -107,9 +113,48 @@ spec:
       recordType: A
       targets:
         - 10.232.1.64
+    # Raspberry Pi
+    - dnsName: ps08rp.alexlebens.net
+      recordTTL: 180
+      recordType: A
+      targets:
+        - 10.232.1.51
+    # Raspberry Pi
+    - dnsName: ps09rp.alexlebens.net
+      recordTTL: 180
+      recordType: A
+      targets:
+        - 10.232.1.52
+
+---
+apiVersion: externaldns.k8s.io/v1alpha1
+kind: DNSEndpoint
+metadata:
+  name: cluster-service-names
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: cluster-service-names
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: networking
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  endpoints:
     # Treafik Proxy
     - dnsName: traefik-cl01tl.alexlebens.net
       recordTTL: 180
       recordType: A
       targets:
         - 10.232.1.21
+    # Treafik Proxy
+    - dnsName: blocky.alexlebens.net
+      recordTTL: 180
+      recordType: A
+      targets:
+        - 10.232.1.22
+    # Treafik Proxy
+    - dnsName: plex.alexlebens.net
+      recordTTL: 180
+      recordType: A
+      targets:
+        - 10.232.1.23