diff --git a/09_homelab_apps/homelab-apps/templates/kube-prometheus-stack.yaml b/09_homelab_apps/homelab-apps/templates/kube-prometheus-stack.yaml
index 03f3e02..8a754a9 100644
--- a/09_homelab_apps/homelab-apps/templates/kube-prometheus-stack.yaml
+++ b/09_homelab_apps/homelab-apps/templates/kube-prometheus-stack.yaml
@@ -23,22 +23,8 @@ spec:
               storageClassName: nfs-csi
             ingress:
               enabled: false
-            httpRoute:
-              enabled: true
-              hostnames: 
-                - grafana.k8s.hnrx.net
-              parentRefs:
-                - name: shared-gateway
-                  namespace: default
           prometheus:
             prometheusSpec:
-              httpRoute:
-                enabled: true
-                hostnames: 
-                  - prometheus.k8s.hnrx.net
-                parentRefs:
-                  - name: shared-gateway
-                    namespace: default
               storageSpec:
                 volumeClaimTemplate:
                   spec:
@@ -48,13 +34,6 @@ spec:
                     storageClassName: nfs-csi
           alertmanager:
             alertmanagerSpec:
-              httpRoute:
-                enabled: true
-                hostnames: 
-                  - alertmanager.k8s.hnrx.net
-                parentRefs:
-                  - name: shared-gateway
-                    namespace: default
               storageSpec:
                 volumeClaimTemplate:
                   spec:
@@ -68,3 +47,66 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ServerSideApply=true
+
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: grafana-route
+  namespace: monitoring
+spec:
+  parentRefs:
+    - name: shared-gateway
+      namespace: default
+  hostnames:
+    - "grafana.k8s.hnrx.net"
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: kube-prometheus-stack-operator
+          port: 443
+
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: prometheus-route
+  namespace: kube-prometheus-stack
+spec:
+  parentRefs:
+    - name: shared-gateway
+      namespace: default
+  hostnames:
+    - "prometheus.k8s.hnrx.net"
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: prometheus-operated
+          port: 9090
+
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: alertmanager-route
+  namespace: kube-prometheus-stack
+spec:
+  parentRefs:
+    - name: shared-gateway
+      namespace: default
+  hostnames:
+    - "alertmanager.k8s.hnrx.net"
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: alertmanager-operated
+          port: 9093
\ No newline at end of file