diff --git a/remodel/k8s/infra/controllers/argocd/http-route.yaml b/remodel/k8s/infra/controllers/argocd/http-route.yaml
index dc73870..a396f64 100644
--- a/remodel/k8s/infra/controllers/argocd/http-route.yaml
+++ b/remodel/k8s/infra/controllers/argocd/http-route.yaml
@@ -1,7 +1,7 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: http-route-euclid
+  name: argocd
   namespace: argocd
 spec:
   parentRefs:
diff --git a/remodel/k8s/infra/monitoring/application-set.yaml b/remodel/k8s/infra/monitoring/application-set.yaml
new file mode 100644
index 0000000..6030657
--- /dev/null
+++ b/remodel/k8s/infra/monitoring/application-set.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: monitoring
+  namespace: argocd
+  labels:
+    dev.stonegarden: monitoring
+spec:
+  generators:
+    - git:
+        repoURL: https://github.com/vehagn/homelab
+        revision: remodel
+        directories:
+          - path: remodel/k8s/infra/monitoring/*
+  template:
+    metadata:
+      name: '{{ path.basename }}'
+      labels:
+        dev.stonegarden: controllers
+    spec:
+      project: monitoring
+      source:
+        plugin:
+          name: kustomize-build-with-helm
+        repoURL: https://github.com/vehagn/homelab
+        targetRevision: remodel
+        path: '{{ path }}'
+      destination:
+        name: in-cluster
+        namespace: argocd
+      syncPolicy:
+        automated:
+          selfHeal: true
+          prune: true
\ No newline at end of file
diff --git a/remodel/k8s/infra/monitoring/hubble/http-route.yaml b/remodel/k8s/infra/monitoring/hubble/http-route.yaml
new file mode 100644
index 0000000..192ddad
--- /dev/null
+++ b/remodel/k8s/infra/monitoring/hubble/http-route.yaml
@@ -0,0 +1,19 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: hubble
+  namespace: kube-system
+spec:
+  parentRefs:
+    - name: stonegarden
+      namespace: gateway
+  hostnames:
+    - "hubble.stonegarden.dev"
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: hubble-ui
+          port: 80
\ No newline at end of file
diff --git a/remodel/k8s/infra/monitoring/hubble/kustomization.yaml b/remodel/k8s/infra/monitoring/hubble/kustomization.yaml
new file mode 100644
index 0000000..19d2152
--- /dev/null
+++ b/remodel/k8s/infra/monitoring/hubble/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - http-route.yaml
diff --git a/remodel/k8s/infra/monitoring/kustomization.yaml b/remodel/k8s/infra/monitoring/kustomization.yaml
new file mode 100644
index 0000000..00fbcbd
--- /dev/null
+++ b/remodel/k8s/infra/monitoring/kustomization.yaml
@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  dev.stonegarden: monitoring
+  app.kubernetes.io/managed-by: argocd
+
+resources:
+  - project.yaml
+  - application-set.yaml
\ No newline at end of file
diff --git a/remodel/k8s/infra/monitoring/project.yaml b/remodel/k8s/infra/monitoring/project.yaml
new file mode 100644
index 0000000..8266a5a
--- /dev/null
+++ b/remodel/k8s/infra/monitoring/project.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: monitoring
+  namespace: argocd
+spec:
+  sourceRepos:
+    - 'https://github.com/vehagn/homelab'
+  destinations:
+    - namespace: 'argocd'
+      server: '*'
+    - namespace: 'kube-system'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
diff --git a/remodel/k8s/infra/network/cilium/values.yaml b/remodel/k8s/infra/network/cilium/values.yaml
index 2197ca9..ebc90e9 100644
--- a/remodel/k8s/infra/network/cilium/values.yaml
+++ b/remodel/k8s/infra/network/cilium/values.yaml
@@ -61,12 +61,12 @@ gatewayAPI:
   enabled: true
 
 hubble:
-  enabled: false
+  enabled: true
   relay:
-    enabled: false
+    enabled: true
     rollOutPods: true
   ui:
-    enabled: false
+    enabled: true
     rollOutPods: true
 
 ingressController: