diff --git a/kubernetes/aaf/templates/aaf-configmap.yaml b/kubernetes/aaf/templates/aaf-configmap.yaml
index c8565f2..b6e494d 100644
--- a/kubernetes/aaf/templates/aaf-configmap.yaml
+++ b/kubernetes/aaf/templates/aaf-configmap.yaml
@@ -3,7 +3,7 @@
 kind: ConfigMap
 metadata:
   name: aaf-data-configmap
-  namespace: {{ .Values.nsPrefix }}-aaf
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ (.Files.Glob "resources/config/aaf-data/*").AsConfig | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
index 55619b3..be5f6c1 100644
--- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: aaf-cs
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 4f64048..50c3e5a 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -5,7 +5,7 @@
   labels:
     app: aaf
   name: aaf
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
diff --git a/kubernetes/aaf/templates/aaf-secret.yaml b/kubernetes/aaf/templates/aaf-secret.yaml
index 705d050..4b6984a 100644
--- a/kubernetes/aaf/templates/aaf-secret.yaml
+++ b/kubernetes/aaf/templates/aaf-secret.yaml
@@ -3,7 +3,7 @@
 kind: Secret
 metadata:
   name: aaf-cs-data-secret
-  namespace: {{ .Values.nsPrefix }}-aaf
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ (.Files.Glob "resources/config/aaf-cs-data/*").AsSecrets | indent 2 }}
diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml
index be04180..0a06d1d 100644
--- a/kubernetes/aaf/templates/all-services.yaml
+++ b/kubernetes/aaf/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: aaf-cs
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aaf-cs
 spec:
@@ -26,7 +26,7 @@
 kind: Service
 metadata:
   name: aaf-authz-service
-  namespace: "{{ .Values.nsPrefix }}-aaf"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: aaf-authz-service
 spec: