diff --git a/kubernetes/apps/default/kresus/app/helmrelease.yaml b/kubernetes/apps/default/kresus/app/helmrelease.yaml
index d5eada7af..d53a4b865 100644
--- a/kubernetes/apps/default/kresus/app/helmrelease.yaml
+++ b/kubernetes/apps/default/kresus/app/helmrelease.yaml
@@ -58,7 +58,7 @@ spec:
               LANG: C.UTF-8
               KRESUS_DB_TYPE: postgres
               KRESUS_DIR: /config
-              KRESUS_EMAIL_HOST: mailrise.default.svc.cluster.local
+              KRESUS_EMAIL_HOST: mailrise.monitoring.svc.cluster.local
               KRESUS_EMAIL_PORT: 8025
               KRESUS_EMAIL_TRANSPORT: smtp
               KRESUS_EMAIL_FROM: kresus@mailrise.home.arpa
diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index fd623cc20..26bd15890 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -33,7 +33,6 @@ resources:
   - ./lldap/ks.yaml
   - ./lms/ks.yaml
   - ./lychee/ks.yaml
-  - ./mailrise/ks.yaml
   - ./maybe/ks.yaml
   - ./music-transcode/ks.yaml
   - ./navidrome/ks.yaml
diff --git a/kubernetes/apps/monitoring/kustomization.yaml b/kubernetes/apps/monitoring/kustomization.yaml
index 64b90303b..4bed110f7 100644
--- a/kubernetes/apps/monitoring/kustomization.yaml
+++ b/kubernetes/apps/monitoring/kustomization.yaml
@@ -9,5 +9,6 @@ resources:
   - ./gatus/ks.yaml
   - ./grafana/ks.yaml
   - ./kube-prometheus-stack/ks.yaml
+  - ./mailrise/ks.yaml
   - ./scrutiny/ks.yaml
   - ./thanos/ks.yaml
diff --git a/kubernetes/apps/default/mailrise/app/externalsecret.yaml b/kubernetes/apps/monitoring/mailrise/app/externalsecret.yaml
similarity index 94%
rename from kubernetes/apps/default/mailrise/app/externalsecret.yaml
rename to kubernetes/apps/monitoring/mailrise/app/externalsecret.yaml
index ac4090fd7..8dc97295c 100644
--- a/kubernetes/apps/default/mailrise/app/externalsecret.yaml
+++ b/kubernetes/apps/monitoring/mailrise/app/externalsecret.yaml
@@ -4,7 +4,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: mailrise
-  namespace: default
+  namespace: monitoring
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/kubernetes/apps/default/mailrise/app/helmrelease.yaml b/kubernetes/apps/monitoring/mailrise/app/helmrelease.yaml
similarity index 99%
rename from kubernetes/apps/default/mailrise/app/helmrelease.yaml
rename to kubernetes/apps/monitoring/mailrise/app/helmrelease.yaml
index 599568e1c..cb3af7168 100644
--- a/kubernetes/apps/default/mailrise/app/helmrelease.yaml
+++ b/kubernetes/apps/monitoring/mailrise/app/helmrelease.yaml
@@ -4,7 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: &app mailrise
-  namespace: default
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
diff --git a/kubernetes/apps/default/mailrise/app/kustomization.yaml b/kubernetes/apps/monitoring/mailrise/app/kustomization.yaml
similarity index 95%
rename from kubernetes/apps/default/mailrise/app/kustomization.yaml
rename to kubernetes/apps/monitoring/mailrise/app/kustomization.yaml
index 015a58b27..e9f07a437 100644
--- a/kubernetes/apps/default/mailrise/app/kustomization.yaml
+++ b/kubernetes/apps/monitoring/mailrise/app/kustomization.yaml
@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
+namespace: monitoring
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
diff --git a/kubernetes/apps/default/mailrise/app/mailrise.yaml b/kubernetes/apps/monitoring/mailrise/app/mailrise.yaml
similarity index 51%
rename from kubernetes/apps/default/mailrise/app/mailrise.yaml
rename to kubernetes/apps/monitoring/mailrise/app/mailrise.yaml
index 0955e4aaf..907f0d6d9 100644
--- a/kubernetes/apps/default/mailrise/app/mailrise.yaml
+++ b/kubernetes/apps/monitoring/mailrise/app/mailrise.yaml
@@ -5,8 +5,3 @@ configs:
       title_template: "KRESUS"
     urls:
       - !env_var PUSHOVER_KRESUS
-  windmill@mailrise.home.arpa:
-    mailrise:
-      title_template: "WINDMILL"
-    urls:
-      - !env_var PUSHOVER_WINDMILL
diff --git a/kubernetes/apps/default/mailrise/ks.yaml b/kubernetes/apps/monitoring/mailrise/ks.yaml
similarity index 87%
rename from kubernetes/apps/default/mailrise/ks.yaml
rename to kubernetes/apps/monitoring/mailrise/ks.yaml
index c6b1725f3..db0f2ca38 100644
--- a/kubernetes/apps/default/mailrise/ks.yaml
+++ b/kubernetes/apps/monitoring/mailrise/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app mailrise
   namespace: flux-system
 spec:
-  targetNamespace: default
+  targetNamespace: monitoring
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/default/mailrise/app
+  path: ./kubernetes/apps/monitoring/mailrise/app
   prune: true
   sourceRef:
     kind: GitRepository