diff --git a/clusters/cl01tl/standalone/cilium/templates/gateway.yaml b/clusters/cl01tl/management/headlamp/templates/gateway.yaml
similarity index 63%
rename from clusters/cl01tl/standalone/cilium/templates/gateway.yaml
rename to clusters/cl01tl/management/headlamp/templates/gateway.yaml
index 70e5b261d..3699b6f7e 100644
--- a/clusters/cl01tl/standalone/cilium/templates/gateway.yaml
+++ b/clusters/cl01tl/management/headlamp/templates/gateway.yaml
@@ -1,10 +1,10 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: https-gateway
+  name: headlamp-https-gateway
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: https-gateway
+    app.kubernetes.io/name: headlamp-https-gateway
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -20,17 +20,17 @@ spec:
     - name: https
       protocol: HTTPS
       port: 443
-      hostname: "*.alexlebens.net"
-      allowedRoutes:
-        namespaces:
-          from: Selector
-          selector:
-            matchLabels:
-              https-gateway-access: "true"
+      hostname: headlamp.alexlebens.net
+      # allowedRoutes:
+      #   namespaces:
+      #     from: Selector
+      #     selector:
+      #       matchLabels:
+      #         https-gateway-access: "true"
       tls:
         mode: Terminate
         certificateRefs:
           - group: ''
             kind: Secret
-            name: https-gateway-cert
-            namespace: kube-system
+            name: https-gateway-headlamp-cert
+            namespace: headlamp
diff --git a/clusters/cl01tl/management/headlamp/templates/http-route.yaml b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
index 785d3a73d..801ddbb28 100644
--- a/clusters/cl01tl/management/headlamp/templates/http-route.yaml
+++ b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
@@ -13,8 +13,8 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: https-gateway
-      namespace: kube-system
+      name: headlamp-https-gateway
+      namespace: headlamp
       sectionName: https
   hostnames:
     - headlamp.alexlebens.net