diff --git a/clusters/cl01tl/management/headlamp/templates/http-route.yaml b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
index fdd1feda1..2bf5c21b5 100644
--- a/clusters/cl01tl/management/headlamp/templates/http-route.yaml
+++ b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
@@ -1,10 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: https-headlamp-route
+  name: https-route-headlamp
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: https-headlamp-route
+    app.kubernetes.io/name: https-route-headlamp
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -13,7 +13,7 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: headlamp-gateway
+      name: https-gateway
   hostnames:
     - headlamp.alexlebens.net
   rules:
diff --git a/clusters/cl01tl/management/headlamp/templates/gateway.yaml b/clusters/cl01tl/standalone/cilium/templates/gateway.yaml
similarity index 78%
rename from clusters/cl01tl/management/headlamp/templates/gateway.yaml
rename to clusters/cl01tl/standalone/cilium/templates/gateway.yaml
index 96e9f57d0..280237aef 100644
--- a/clusters/cl01tl/management/headlamp/templates/gateway.yaml
+++ b/clusters/cl01tl/standalone/cilium/templates/gateway.yaml
@@ -1,10 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: headlamp-gateway
+  name: https-gateway
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: headlamp-gateway
+    app.kubernetes.io/name: https-gateway
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -17,9 +17,9 @@ spec:
     - name: https
       protocol: HTTPS
       port: 443
-      hostname: headlamp.alexlebens.net
+      hostname: '*.alexlebens.net'
       tls:
         certificateRefs:
           - group: ''
             kind: Secret
-            name: headlamp-gateway-cert
+            name: https-gateway-cert