diff --git a/clusters/cl01tl/applications/book-bounty/values.yaml b/clusters/cl01tl/applications/book-bounty/values.yaml
index 9e00734b9..b8c312842 100644
--- a/clusters/cl01tl/applications/book-bounty/values.yaml
+++ b/clusters/cl01tl/applications/book-bounty/values.yaml
@@ -44,7 +44,7 @@ book-bounty:
       enabled: true
       className: tailscale
       hosts:
-        - host: bookbounty.cl01tl
+        - host: bookbounty-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -53,7 +53,7 @@ book-bounty:
                 port: 80
       tls:
         - hosts:
-            - bookbounty.cl01tl
+            - bookbounty-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/homepage-tailscale/values.yaml b/clusters/cl01tl/applications/homepage-tailscale/values.yaml
index db2a38b34..d3669d53f 100644
--- a/clusters/cl01tl/applications/homepage-tailscale/values.yaml
+++ b/clusters/cl01tl/applications/homepage-tailscale/values.yaml
@@ -121,7 +121,7 @@ homepage:
               - Sonarr:
                   icon: sonarr.png
                   description: TV Shows
-                  href: https://sonarr.cl01tl.boreal-beaufort.ts.net
+                  href: https://sonarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://sonarr4.sonarr4:80
                   statusStyle: dot
                   widget:
@@ -133,7 +133,7 @@ homepage:
               - Sonarr 4K:
                   icon: sonarr.png
                   description: TV Shows 4K
-                  href: https://sonarr-4k.cl01tl.boreal-beaufort.ts.net
+                  href: https://sonarr-4k-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://sonarr4-4k.sonarr4-4k:80
                   statusStyle: dot
                   widget:
@@ -146,7 +146,7 @@ homepage:
               - Radarr:
                   icon: radarr.png
                   description: Movies
-                  href: https://radarr.cl01tl.boreal-beaufort.ts.net
+                  href: https://radarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://radarr5.radarr5:80
                   statusStyle: dot
                   widget:
@@ -158,7 +158,7 @@ homepage:
               - Radarr 4K:
                   icon: radarr.png
                   description: Movies 4K
-                  href: https://radarr-4k.cl01tl.boreal-beaufort.ts.net
+                  href: https://radarr-4k-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://radarr5-4k.radarr5-4k:80
                   statusStyle: dot
                   widget:
@@ -171,7 +171,7 @@ homepage:
               - Lidarr:
                   icon: lidarr.png
                   description: Music
-                  href: https://lidarr.cl01tl.boreal-beaufort.ts.net
+                  href: https://lidarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://lidarr2.lidarr2:80
                   statusStyle: dot
                   widget:
@@ -182,7 +182,7 @@ homepage:
               - Readarr Books:
                   icon: readarr.png
                   description: Books
-                  href: https://readarr-books.cl01tl.boreal-beaufort.ts.net
+                  href: https://readarr-books-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://readarr-books.readarr-books:80
                   statusStyle: dot
                   widget:
@@ -194,14 +194,14 @@ homepage:
               - Readarr Audiobooks:
                   icon: readarr.png
                   description: Audiobooks
-                  href: https://readarr-audiobooks.cl01tl.boreal-beaufort.ts.net
+                  href: https://readarr-audiobooks-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://readarr-audiobooks.readarr-audiobooks:80
                   statusStyle: dot
           - Media Services:
               - qBittorrent:
                   icon: qbittorrent.png
                   description: P2P Downloads
-                  href: https://qbittorrent.cl01tl.boreal-beaufort.ts.net
+                  href: https://qbittorrent-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://qbittorrent.qbittorrent:8080
                   statusStyle: dot
                   widget:
@@ -210,7 +210,7 @@ homepage:
               - Tdarr:
                   icon: tdarr.png
                   description: Media transcoding and health checks
-                  href: https://tdarr.cl01tl.boreal-beaufort.ts.net
+                  href: https://tdarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://tdarr-web.tdarr:8265
                   statusStyle: dot
                   widget:
@@ -219,7 +219,7 @@ homepage:
               - Prowlarr:
                   icon: prowlarr.png
                   description: Indexers
-                  href: https://prowlarr.cl01tl.boreal-beaufort.ts.net
+                  href: https://prowlarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://prowlarr.prowlarr:80
                   statusStyle: dot
                   widget:
@@ -229,13 +229,13 @@ homepage:
               - Book Bounty:
                   icon: https://raw.githubusercontent.com/TheWicklowWolf/BookBounty/main/src/static/bookbounty.png
                   description: Searches for Books
-                  href: https://bookbounty.cl01tl.boreal-beaufort.ts.net
+                  href: https://bookbounty-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://book-bounty.book-bounty:80
                   statusStyle: dot
               - LidaTube:
                   icon: https://raw.githubusercontent.com/TheWicklowWolf/LidaTube/main/src/static/lidatube.png
                   description: Searches for Music
-                  href: https://lidatube.cl01tl.boreal-beaufort.ts.net
+                  href: https://lidatube-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://lidatube.lidatube:80
                   statusStyle: dot
         bookmarks.yaml: |
diff --git a/clusters/cl01tl/applications/lidarr2/values.yaml b/clusters/cl01tl/applications/lidarr2/values.yaml
index 744868a0b..c1f23284a 100644
--- a/clusters/cl01tl/applications/lidarr2/values.yaml
+++ b/clusters/cl01tl/applications/lidarr2/values.yaml
@@ -129,7 +129,7 @@ lidarr2:
       enabled: true
       className: tailscale
       hosts:
-        - host: lidarr.cl01tl
+        - host: lidarr-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -138,7 +138,7 @@ lidarr2:
                 port: 80
       tls:
         - hosts:
-            - lidarr.cl01tl
+            - lidarr-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/lidatube/values.yaml b/clusters/cl01tl/applications/lidatube/values.yaml
index 89174c620..e66a54c90 100644
--- a/clusters/cl01tl/applications/lidatube/values.yaml
+++ b/clusters/cl01tl/applications/lidatube/values.yaml
@@ -44,7 +44,7 @@ lidatube:
       enabled: true
       className: tailscale
       hosts:
-        - host: lidatube.cl01tl
+        - host: lidatube-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -53,7 +53,7 @@ lidatube:
                 port: 80
       tls:
         - hosts:
-            - lidatube.cl01tl
+            - lidatube-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/prowlarr/values.yaml b/clusters/cl01tl/applications/prowlarr/values.yaml
index d16c5fefa..875659171 100644
--- a/clusters/cl01tl/applications/prowlarr/values.yaml
+++ b/clusters/cl01tl/applications/prowlarr/values.yaml
@@ -80,7 +80,7 @@ prowlarr:
       enabled: true
       className: tailscale
       hosts:
-        - host: prowlarr.cl01tl
+        - host: prowlarr-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -89,7 +89,7 @@ prowlarr:
                 port: 80
       tls:
         - hosts:
-            - prowlarr.cl01tl
+            - prowlarr-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/radarr5-4k/values.yaml b/clusters/cl01tl/applications/radarr5-4k/values.yaml
index 8ade53ee4..201e02255 100644
--- a/clusters/cl01tl/applications/radarr5-4k/values.yaml
+++ b/clusters/cl01tl/applications/radarr5-4k/values.yaml
@@ -129,7 +129,7 @@ radarr5-4k:
       enabled: true
       className: tailscale
       hosts:
-        - host: radarr-4k.cl01tl
+        - host: radarr-4k-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -138,7 +138,7 @@ radarr5-4k:
                 port: 80
       tls:
         - hosts:
-            - radarr-4k.cl01tl
+            - radarr-4k-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/radarr5/values.yaml b/clusters/cl01tl/applications/radarr5/values.yaml
index 48fcf1816..e7b70c860 100644
--- a/clusters/cl01tl/applications/radarr5/values.yaml
+++ b/clusters/cl01tl/applications/radarr5/values.yaml
@@ -129,7 +129,7 @@ radarr5:
       enabled: true
       className: tailscale
       hosts:
-        - host: radarr.cl01tl
+        - host: radarr-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -138,7 +138,7 @@ radarr5:
                 port: 80
       tls:
         - hosts:
-            - radarr.cl01tl
+            - radarr-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/readarr-audiobooks/values.yaml b/clusters/cl01tl/applications/readarr-audiobooks/values.yaml
index d613ae17c..994aea7cc 100644
--- a/clusters/cl01tl/applications/readarr-audiobooks/values.yaml
+++ b/clusters/cl01tl/applications/readarr-audiobooks/values.yaml
@@ -131,7 +131,7 @@ readarr-audiobooks:
       enabled: true
       className: tailscale
       hosts:
-        - host: readarr-audiobooks.cl01tl
+        - host: readarr-audiobooks-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -140,7 +140,7 @@ readarr-audiobooks:
                 port: 80
       tls:
         - hosts:
-            - readarr-audiobooks.cl01tl
+            - readarr-audiobooks-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/readarr-books/values.yaml b/clusters/cl01tl/applications/readarr-books/values.yaml
index 136ee0d26..3b9f0f504 100644
--- a/clusters/cl01tl/applications/readarr-books/values.yaml
+++ b/clusters/cl01tl/applications/readarr-books/values.yaml
@@ -131,7 +131,7 @@ readarr-books:
       enabled: true
       className: tailscale
       hosts:
-        - host: readarr-books.cl01tl
+        - host: readarr-books-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -140,7 +140,7 @@ readarr-books:
                 port: 80
       tls:
         - hosts:
-            - readarr-books.cl01tl
+            - readarr-books-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/sonarr4-4k/values.yaml b/clusters/cl01tl/applications/sonarr4-4k/values.yaml
index 1a286f675..eb39ea57f 100644
--- a/clusters/cl01tl/applications/sonarr4-4k/values.yaml
+++ b/clusters/cl01tl/applications/sonarr4-4k/values.yaml
@@ -129,7 +129,7 @@ sonarr4-4k:
       enabled: true
       className: tailscale
       hosts:
-        - host: sonarr-4k.cl01tl
+        - host: sonarr-4k-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -138,7 +138,7 @@ sonarr4-4k:
                 port: 80
       tls:
         - hosts:
-            - sonarr-4k.cl01tl
+            - sonarr-4k-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/sonarr4/values.yaml b/clusters/cl01tl/applications/sonarr4/values.yaml
index 091220ba3..85c234c56 100644
--- a/clusters/cl01tl/applications/sonarr4/values.yaml
+++ b/clusters/cl01tl/applications/sonarr4/values.yaml
@@ -129,7 +129,7 @@ sonarr4:
       enabled: true
       className: tailscale
       hosts:
-        - host: sonarr.cl01tl
+        - host: sonarr-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -138,7 +138,7 @@ sonarr4:
                 port: 80
       tls:
         - hosts:
-            - sonarr.cl01tl
+            - sonarr-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/applications/tdarr/values.yaml b/clusters/cl01tl/applications/tdarr/values.yaml
index 65cc00927..fac9cdb43 100644
--- a/clusters/cl01tl/applications/tdarr/values.yaml
+++ b/clusters/cl01tl/applications/tdarr/values.yaml
@@ -118,7 +118,7 @@ tdarr:
       enabled: true
       className: tailscale
       hosts:
-        - host: tdarr.cl01tl
+        - host: tdarr-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -127,7 +127,7 @@ tdarr:
                 port: 8265
       tls:
         - hosts:
-            - tdarr.cl01tl
+            - tdarr-cl01tl
   persistence:
     config:
       storageClass: ceph-block
diff --git a/clusters/cl01tl/platform/qbittorrent/values.yaml b/clusters/cl01tl/platform/qbittorrent/values.yaml
index 2a03b4ecd..e400041eb 100644
--- a/clusters/cl01tl/platform/qbittorrent/values.yaml
+++ b/clusters/cl01tl/platform/qbittorrent/values.yaml
@@ -146,7 +146,7 @@ qbittorrent:
       enabled: true
       className: tailscale
       hosts:
-        - host: qbittorrent.cl01tl
+        - host: qbittorrent-cl01tl
           paths:
             - path: /
               pathType: Prefix
@@ -155,7 +155,7 @@ qbittorrent:
                 port: 8080
       tls:
         - hosts:
-            - qbittorrent.cl01tl
+            - qbittorrent-cl01tl
   persistence:
     config:
       type: persistentVolumeClaim