diff --git a/clusters/cl01tl/services/blocky/values.yaml b/clusters/cl01tl/services/blocky/values.yaml
index b2c93402b..f78549faa 100644
--- a/clusters/cl01tl/services/blocky/values.yaml
+++ b/clusters/cl01tl/services/blocky/values.yaml
@@ -96,11 +96,12 @@ blocky:
               cl01tl-endpoint                 IN      A       10.232.1.22
               cl01tl-endpoint                 IN      A       10.232.1.23
 
+              cl01tl-gateway                  IN      A       10.232.2.10
+
               traefik-cl01tl                  IN      A       10.232.1.21
               blocky                          IN      A       10.232.1.22
               plex-lb                         IN      A       10.232.1.23
 
-
               ;; Application Names
               actual                          IN      CNAME   traefik-cl01tl
               alertmanager                    IN      CNAME   traefik-cl01tl
@@ -122,7 +123,7 @@ blocky:
               home                            IN      CNAME   traefik-cl01tl
               home-assistant                  IN      CNAME   traefik-cl01tl
               home-assistant-code-server      IN      CNAME   traefik-cl01tl
-              hubble                          IN      CNAME   traefik-cl01tl
+              hubble                          IN      CNAME   cl01tl-gateway
               huntarr                         IN      CNAME   traefik-cl01tl
               immich                          IN      CNAME   traefik-cl01tl
               jellyfin                        IN      CNAME   traefik-cl01tl
diff --git a/clusters/cl01tl/standalone/cilium/templates/http-route.yaml b/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
index 603a5e574..029fcd577 100644
--- a/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
+++ b/clusters/cl01tl/standalone/cilium/templates/http-route.yaml
@@ -11,8 +11,8 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: traefik-gateway
-      namespace: traefik
+      name: tls-gateway
+      namespace: kube-system
   hostnames:
     - hubble.alexlebens.net
   rules:
diff --git a/hosts/ps08rp/blocky/config.yml b/hosts/ps08rp/blocky/config.yml
index 1ce8feb04..eedd1f56d 100644
--- a/hosts/ps08rp/blocky/config.yml
+++ b/hosts/ps08rp/blocky/config.yml
@@ -97,7 +97,7 @@ customDNS:
     home                            IN      CNAME   traefik-cl01tl
     home-assistant                  IN      CNAME   traefik-cl01tl
     home-assistant-code-server      IN      CNAME   traefik-cl01tl
-    hubble                          IN      CNAME   traefik-cl01tl
+    hubble                          IN      CNAME   cl01tl-gateway
     huntarr                         IN      CNAME   traefik-cl01tl
     immich                          IN      CNAME   traefik-cl01tl
     jellyfin                        IN      CNAME   traefik-cl01tl
diff --git a/hosts/ps09rp/blocky/config.yml b/hosts/ps09rp/blocky/config.yml
index 1ce8feb04..eedd1f56d 100644
--- a/hosts/ps09rp/blocky/config.yml
+++ b/hosts/ps09rp/blocky/config.yml
@@ -97,7 +97,7 @@ customDNS:
     home                            IN      CNAME   traefik-cl01tl
     home-assistant                  IN      CNAME   traefik-cl01tl
     home-assistant-code-server      IN      CNAME   traefik-cl01tl
-    hubble                          IN      CNAME   traefik-cl01tl
+    hubble                          IN      CNAME   cl01tl-gateway
     huntarr                         IN      CNAME   traefik-cl01tl
     immich                          IN      CNAME   traefik-cl01tl
     jellyfin                        IN      CNAME   traefik-cl01tl