diff --git a/argocd-apps/raw-resources-mail-services.yaml b/argocd-apps/raw-resources-mail-services.yaml
index 10f55f0..ed37c32 100644
--- a/argocd-apps/raw-resources-mail-services.yaml
+++ b/argocd-apps/raw-resources-mail-services.yaml
@@ -15,7 +15,7 @@ spec:
   
   destination:
     server: https://kubernetes.default.svc
-    namespace: mail
+    namespace: mail-services
   
   syncPolicy:
     automated:
diff --git a/argocd-apps/snappymail.yaml b/argocd-apps/snappymail.yaml
index 76c7fae..eaa2fab 100644
--- a/argocd-apps/snappymail.yaml
+++ b/argocd-apps/snappymail.yaml
@@ -18,7 +18,7 @@ spec:
   
   destination:
     server: https://kubernetes.default.svc
-    namespace: mail
+    namespace: mail-services
   
   syncPolicy:
     automated:
diff --git a/argocd-apps/stalwart.yaml b/argocd-apps/stalwart.yaml
index 7ff8fbb..479ff32 100644
--- a/argocd-apps/stalwart.yaml
+++ b/argocd-apps/stalwart.yaml
@@ -18,7 +18,7 @@ spec:
   
   destination:
     server: https://kubernetes.default.svc
-    namespace: mail
+    namespace: mail-services
   
   ignoreDifferences:
   - group: apps
diff --git a/charts/snappymail/values.yaml b/charts/snappymail/values.yaml
index 5c3a18b..c9516b4 100644
--- a/charts/snappymail/values.yaml
+++ b/charts/snappymail/values.yaml
@@ -8,7 +8,7 @@ image:
   pullPolicy: IfNotPresent
 
 ## Namespace
-namespace: mail
+namespace: mail-services
 
 ## Replica count
 replicaCount: 1
diff --git a/charts/stalwart/values.yaml b/charts/stalwart/values.yaml
index fa575fa..1d73b2a 100644
--- a/charts/stalwart/values.yaml
+++ b/charts/stalwart/values.yaml
@@ -8,7 +8,7 @@ image:
   pullPolicy: IfNotPresent
 
 ## Namespace
-namespace: mail
+namespace: mail-services
 
 ## Replica count (should be 1 for StatefulSet with persistent data)
 replicaCount: 1
diff --git a/manifests/raw-resources-mail-services/stalwart-loadbalancer-service.yaml b/manifests/raw-resources-mail-services/stalwart-loadbalancer-service.yaml
index e36a631..082b47d 100644
--- a/manifests/raw-resources-mail-services/stalwart-loadbalancer-service.yaml
+++ b/manifests/raw-resources-mail-services/stalwart-loadbalancer-service.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: stalwart-mail-ports
-  namespace: mail
+  namespace: mail-services
   labels:
     app: stalwart
   annotations:
diff --git a/manifests/raw-resources-mail-services/stalwart-nodeport-service.yaml b/manifests/raw-resources-mail-services/stalwart-nodeport-service.yaml
index 3d10257..0b8cf8b 100644
--- a/manifests/raw-resources-mail-services/stalwart-nodeport-service.yaml
+++ b/manifests/raw-resources-mail-services/stalwart-nodeport-service.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: stalwart-external
-  namespace: mail
+  namespace: mail-services
   labels:
     app: stalwart
 spec:
diff --git a/manifests/snappymail/values.yaml b/manifests/snappymail/values.yaml
index f3cbe3a..9ebed9b 100644
--- a/manifests/snappymail/values.yaml
+++ b/manifests/snappymail/values.yaml
@@ -2,7 +2,7 @@
 ## Override default chart values here
 
 ## Namespace
-namespace: mail
+namespace: mail-services
 
 ## Image configuration
 image:
diff --git a/manifests/stalwart/values.yaml b/manifests/stalwart/values.yaml
index 42610b6..642afbd 100644
--- a/manifests/stalwart/values.yaml
+++ b/manifests/stalwart/values.yaml
@@ -2,7 +2,7 @@
 ## Override default chart values here
 
 ## Namespace
-namespace: mail
+namespace: mail-services
 
 ## Image configuration
 image: