diff --git a/clusters/cl01tl/management/headlamp/templates/gateway.yaml b/clusters/cl01tl/management/headlamp/templates/gateway.yaml
new file mode 100644
index 000000000..569f51b1f
--- /dev/null
+++ b/clusters/cl01tl/management/headlamp/templates/gateway.yaml
@@ -0,0 +1,24 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: headlamp-gateway
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: headlamp-gateway
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-issuer
+spec:
+  gatewayClassName: cilium
+  listeners:
+    - name: https
+      protocol: HTTPS
+      port: 443
+      hostname: headlamp.alexlebens.net
+      tls:
+        certificateRefs:
+          - kind: Secret
+            name: headlamp-gateway-cert
diff --git a/clusters/cl01tl/management/headlamp/templates/http-route.yaml b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
new file mode 100644
index 000000000..d77e2e915
--- /dev/null
+++ b/clusters/cl01tl/management/headlamp/templates/http-route.yaml
@@ -0,0 +1,24 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: https-headlamp-route
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: https-headlamp-route
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  parentRefs:
+    - name: headlamp-gateway
+  hostnames:
+    - headlamp.alexlebens.net
+  rules:
+    - matches:
+      - path:
+          type: ImplementationSpecific
+          value: /
+      backendRefs:
+        - name: headlamp
+          port: 80
diff --git a/clusters/cl01tl/management/headlamp/templates/ingress.yaml b/clusters/cl01tl/management/headlamp/templates/ingress.yaml
index 42a12edb3..2128cddac 100644
--- a/clusters/cl01tl/management/headlamp/templates/ingress.yaml
+++ b/clusters/cl01tl/management/headlamp/templates/ingress.yaml
@@ -1,32 +1,32 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: headlamp-local
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: headlamp-local
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    cert-manager.io/cluster-issuer: letsencrypt-issuer
-spec:
-  ingressClassName: traefik
-  tls:
-    - hosts:
-        - headlamp.alexlebens.net
-      secretName: headlamp-tls-secret
-  rules:
-    - host: headlamp-cl01tl
-      http:
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: headlamp
-                port:
-                  number: 80
+# apiVersion: networking.k8s.io/v1
+# kind: Ingress
+# metadata:
+#   name: headlamp-local
+#   namespace: {{ .Release.Namespace }}
+#   labels:
+#     app.kubernetes.io/name: headlamp-local
+#     app.kubernetes.io/instance: {{ .Release.Name }}
+#     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+#     app.kubernetes.io/component: web
+#     app.kubernetes.io/part-of: {{ .Release.Name }}
+#   annotations:
+#     traefik.ingress.kubernetes.io/router.entrypoints: websecure
+#     traefik.ingress.kubernetes.io/router.tls: "true"
+#     cert-manager.io/cluster-issuer: letsencrypt-issuer
+# spec:
+#   ingressClassName: traefik
+#   tls:
+#     - hosts:
+#         - headlamp.alexlebens.net
+#       secretName: headlamp-tls-secret
+#   rules:
+#     - host: headlamp-cl01tl
+#       http:
+#         paths:
+#           - path: /
+#             pathType: ImplementationSpecific
+#             backend:
+#               service:
+#                 name: headlamp
+#                 port:
+#                   number: 80