diff --git a/apps/ceph/cluster/values.yaml b/apps/ceph/cluster/values.yaml
index af469aa..b95d560 100644
--- a/apps/ceph/cluster/values.yaml
+++ b/apps/ceph/cluster/values.yaml
@@ -12,8 +12,19 @@ rook-ceph-cluster:
     enabled: true
 
   ingress:
+    dashboard: {}
+
+  route:
     dashboard:
-      enabled: false  # We'll use Gateway API instead
+      enabled: true
+      host:
+        name: ceph.noxxos.nl
+        path: "/"
+        pathType: PathPrefix
+      parentRefs:
+        - name: traefik-gateway
+          namespace: traefik
+          sectionName: websecure
 
   cephClusterSpec:
     crashCollector:
@@ -33,6 +44,7 @@ rook-ceph-cluster:
     dashboard:
       enabled: true
       ssl: false
+      port: 7000
 
     resources:
       mgr:
@@ -182,66 +194,13 @@ rook-ceph-cluster:
         enabled: true
         reclaimPolicy: Delete
         volumeBindingMode: "Immediate"
-      ingress:
-        enabled: false  # We'll use Gateway API instead
-
-  # Gateway API HTTPRoutes for Ceph Dashboard and S3
-  extraObjects:
-    # ReferenceGrant for Gateway to access rook-ceph namespace
-    - apiVersion: gateway.networking.k8s.io/v1beta1
-      kind: ReferenceGrant
-      metadata:
-        name: traefik-gateway-access
-        namespace: rook-ceph
-      spec:
-        from:
-          - group: gateway.networking.k8s.io
-            kind: HTTPRoute
-            namespace: rook-ceph
-        to:
-          - group: ""
-            kind: Service
-
-    # Ceph Dashboard HTTPRoute
-    - apiVersion: gateway.networking.k8s.io/v1
-      kind: HTTPRoute
-      metadata:
-        name: ceph-dashboard
-        namespace: rook-ceph
-      spec:
+      route:
+        enabled: true
+        host:
+          name: s3.noxxos.nl
+          path: "/"
+          pathType: PathPrefix
         parentRefs:
           - name: traefik-gateway
             namespace: traefik
             sectionName: websecure
-        hostnames:
-          - "ceph.noxxos.nl"
-        rules:
-          - matches:
-              - path:
-                  type: PathPrefix
-                  value: /
-            backendRefs:
-              - name: rook-ceph-mgr-dashboard
-                port: 7000
-
-    # S3 Object Storage HTTPRoute
-    - apiVersion: gateway.networking.k8s.io/v1
-      kind: HTTPRoute
-      metadata:
-        name: ceph-s3
-        namespace: rook-ceph
-      spec:
-        parentRefs:
-          - name: traefik-gateway
-            namespace: traefik
-            sectionName: websecure
-        hostnames:
-          - "s3.noxxos.nl"
-        rules:
-          - matches:
-              - path:
-                  type: PathPrefix
-                  value: /
-            backendRefs:
-              - name: rook-ceph-rgw-ceph-objectstore
-                port: 80