diff --git a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
index d013cee59..ae891643a 100644
--- a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
+++ b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
@@ -111,7 +111,7 @@ data:
         home                            IN      CNAME   traefik-cl01tl
         home-assistant                  IN      CNAME   traefik-cl01tl
         home-assistant-code-server      IN      CNAME   traefik-cl01tl
-        hubble                          IN      CNAME   cilium-cl01tl
+        hubble                          IN      CNAME   traefik-cl01tl
         huntarr                         IN      CNAME   traefik-cl01tl
         immich                          IN      CNAME   traefik-cl01tl
         jellyfin                        IN      CNAME   traefik-cl01tl
diff --git a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
index d53eceb70..3e75514db 100644
--- a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
+++ b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configMaps: 7954de116afb48646b09266a049b24480f3e5a0518ed49935fbfa731e1c3cb49
+        checksum/configMaps: 3c86f37d2aab1784dc86c84355ee3355d6265d9d3116190e88c6c734c122550c
       labels:
         app.kubernetes.io/controller: main
         app.kubernetes.io/instance: blocky
diff --git a/clusters/cl01tl/manifests/cilium/CiliumL2AnnouncementPolicy-node-gateway-l2-policy.yaml b/clusters/cl01tl/manifests/cilium/CiliumL2AnnouncementPolicy-node-gateway-l2-policy.yaml
deleted file mode 100644
index 2081ea1a1..000000000
--- a/clusters/cl01tl/manifests/cilium/CiliumL2AnnouncementPolicy-node-gateway-l2-policy.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: "cilium.io/v2alpha1"
-kind: CiliumL2AnnouncementPolicy
-metadata:
-  name: node-gateway-l2-policy
-  namespace: kube-system
-  labels:
-    app.kubernetes.io/name: node-gateway-l2-policy
-    app.kubernetes.io/instance: cilium
-    app.kubernetes.io/part-of: cilium
-spec:
-  nodeSelector:
-    matchLabels:
-      kubernetes.io/hostname: talos-ix7-xku
-  interfaces:
-    - end0
-    - enp6s0
-  externalIPs: true
-  loadBalancerIPs: true
diff --git a/clusters/cl01tl/manifests/cilium/ClusterRole-cilium.yaml b/clusters/cl01tl/manifests/cilium/ClusterRole-cilium.yaml
index 8344a1a93..92b76c741 100644
--- a/clusters/cl01tl/manifests/cilium/ClusterRole-cilium.yaml
+++ b/clusters/cl01tl/manifests/cilium/ClusterRole-cilium.yaml
@@ -33,16 +33,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - coordination.k8s.io
-    resources:
-      - leases
-    verbs:
-      - create
-      - get
-      - update
-      - list
-      - delete
   - apiGroups:
       - apiextensions.k8s.io
     resources:
diff --git a/clusters/cl01tl/manifests/cilium/ConfigMap-cilium-config.yaml b/clusters/cl01tl/manifests/cilium/ConfigMap-cilium-config.yaml
index b58bcebb4..0b4f0b81f 100644
--- a/clusters/cl01tl/manifests/cilium/ConfigMap-cilium-config.yaml
+++ b/clusters/cl01tl/manifests/cilium/ConfigMap-cilium-config.yaml
@@ -115,7 +115,6 @@ data:
   vtep-mask: ""
   vtep-mac: ""
   enable-k8s-endpoint-slice: "true"
-  enable-l2-announcements: "true"
   procfs: "/host/proc"
   bpf-root: "/sys/fs/bpf"
   cgroup-root: "/sys/fs/cgroup"
diff --git a/clusters/cl01tl/manifests/cilium/DaemonSet-cilium.yaml b/clusters/cl01tl/manifests/cilium/DaemonSet-cilium.yaml
index 0f8c1438f..6352a60ff 100644
--- a/clusters/cl01tl/manifests/cilium/DaemonSet-cilium.yaml
+++ b/clusters/cl01tl/manifests/cilium/DaemonSet-cilium.yaml
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: "397445692955f32e6bbfa856f565c5d3d0dc54deb1b50b899fa9da83855f5946"
+        cilium.io/cilium-configmap-checksum: "9f67de7f01bb2bf87c953f3042be7aa5cb195bedc250957e485cd90aeb6c80ea"
         kubectl.kubernetes.io/default-container: cilium-agent
       labels:
         k8s-app: cilium
diff --git a/clusters/cl01tl/manifests/cilium/Deployment-cilium-operator.yaml b/clusters/cl01tl/manifests/cilium/Deployment-cilium-operator.yaml
index c9b4db78c..48d4f7770 100644
--- a/clusters/cl01tl/manifests/cilium/Deployment-cilium-operator.yaml
+++ b/clusters/cl01tl/manifests/cilium/Deployment-cilium-operator.yaml
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: "397445692955f32e6bbfa856f565c5d3d0dc54deb1b50b899fa9da83855f5946"
+        cilium.io/cilium-configmap-checksum: "9f67de7f01bb2bf87c953f3042be7aa5cb195bedc250957e485cd90aeb6c80ea"
       labels:
         io.cilium/app: operator
         name: cilium-operator
diff --git a/clusters/cl01tl/manifests/cilium/Gateway-cilium-tls-gateway.yaml b/clusters/cl01tl/manifests/cilium/Gateway-cilium-tls-gateway.yaml
deleted file mode 100644
index 6e03d0b48..000000000
--- a/clusters/cl01tl/manifests/cilium/Gateway-cilium-tls-gateway.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: cilium-tls-gateway
-  namespace: kube-system
-  labels:
-    app.kubernetes.io/name: cilium-tls-gateway
-    app.kubernetes.io/instance: cilium
-    app.kubernetes.io/part-of: cilium
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-issuer
-    io.cilium/lb-ipam-ips: "10.232.1.23"
-spec:
-  addresses:
-    - type: IPAddress
-      value: 10.232.1.23
-  gatewayClassName: cilium
-  listeners:
-    - allowedRoutes:
-        namespaces:
-          from: All
-      hostname: '*.alexlebens.net'
-      name: https
-      port: 443
-      protocol: HTTPS
-      tls:
-        certificateRefs:
-          - group: ''
-            kind: Secret
-            name: https-gateway-cert
-            namespace: kube-system
-        mode: Terminate
-    - allowedRoutes:
-        namespaces:
-          from: All
-      hostname: 'alexlebens.net'
-      name: https-domain
-      port: 443
-      protocol: HTTPS
-      tls:
-        certificateRefs:
-          - group: ''
-            kind: Secret
-            name: https-gateway-cert
-            namespace: kube-system
-        mode: Terminate
diff --git a/clusters/cl01tl/manifests/cilium/HTTPRoute-hubble.yaml b/clusters/cl01tl/manifests/cilium/HTTPRoute-hubble.yaml
index d47e6e429..b1f64e09b 100644
--- a/clusters/cl01tl/manifests/cilium/HTTPRoute-hubble.yaml
+++ b/clusters/cl01tl/manifests/cilium/HTTPRoute-hubble.yaml
@@ -11,8 +11,8 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: cilium-tls-gateway
-      namespace: kube-system
+      name: traefik-gateway
+      namespace: traefik
   hostnames:
     - hubble.alexlebens.net
   rules: