diff --git a/charts/ds389/templates/secrets.yaml b/charts/ds389/templates/secrets.yaml
index ce882b3..2a404db 100644
--- a/charts/ds389/templates/secrets.yaml
+++ b/charts/ds389/templates/secrets.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: dirsrv-tls-secret
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 data:
   tls.key: {{ .Values.ds389.tlsKey | b64enc | quote }}
   tls.crt: {{ .Values.ds389.tlsCert | b64enc | quote }}
@@ -12,7 +12,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: dirsrv-dm-password
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 data:
   dm-password: {{ .Values.ds389.dmPassword | quote }}
 
diff --git a/charts/ds389/templates/service-external.yaml b/charts/ds389/templates/service-external.yaml
index e454d0c..1d60d84 100644
--- a/charts/ds389/templates/service-external.yaml
+++ b/charts/ds389/templates/service-external.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: {{ .Values.ds389.name }}
   name: {{ .Values.ds389.name }}-external-svc
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 spec:
   ports:
     - name: {{ .Values.ds389.name }}-port
diff --git a/charts/ds389/templates/service-internal.yaml b/charts/ds389/templates/service-internal.yaml
index eb6178d..caff2df 100644
--- a/charts/ds389/templates/service-internal.yaml
+++ b/charts/ds389/templates/service-internal.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: {{ .Values.ds389.name }}
   name: {{ .Values.ds389.name }}-internal-svc
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 spec:
   clusterIP: None
   ports:
diff --git a/charts/ds389/templates/serviceaccount.yaml b/charts/ds389/templates/serviceaccount.yaml
index ce47416..d125fad 100644
--- a/charts/ds389/templates/serviceaccount.yaml
+++ b/charts/ds389/templates/serviceaccount.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.ds389.name }}-sa
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 
diff --git a/charts/ds389/templates/statefulset.yaml b/charts/ds389/templates/statefulset.yaml
index 9639426..14b2d1a 100644
--- a/charts/ds389/templates/statefulset.yaml
+++ b/charts/ds389/templates/statefulset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ .Values.ds389.name }}
-  namespace: {{ .Values.ds389.nsName }}
+#  namespace: {{ .Values.ds389.nsName }}
 spec:
   serviceName: {{ .Values.ds389.name }}-internal-svc
   replicas: 1