diff --git a/k8s/aeraki-bootstrap-config.yaml b/k8s/aeraki-bootstrap-config.yaml
index 745fc79aa..416491221 100644
--- a/k8s/aeraki-bootstrap-config.yaml
+++ b/k8s/aeraki-bootstrap-config.yaml
@@ -16,7 +16,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  annotations:
   name: aeraki-bootstrap-config
 data:
   custom_bootstrap.json: |-
diff --git a/k8s/aeraki.yaml b/k8s/aeraki.yaml
index dbd21ba6b..7d3994b74 100644
--- a/k8s/aeraki.yaml
+++ b/k8s/aeraki.yaml
@@ -118,7 +118,7 @@ kind: Role
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
   namespace: ${AERAKI_NAMESPACE}
 rules:
   - apiGroups:
@@ -140,12 +140,12 @@ kind: RoleBinding
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
   namespace: ${AERAKI_NAMESPACE}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
 subjects:
   - kind: ServiceAccount
     name: aeraki
@@ -155,7 +155,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
 rules:
   - apiGroups:
       - ""
@@ -200,11 +200,11 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: aeraki
+  name: aeraki-${AERAKI_NAMESPACE}
 subjects:
   - kind: ServiceAccount
     name: aeraki
diff --git a/manifests/charts/aeraki/templates/clusterrole.yaml b/manifests/charts/aeraki/templates/clusterrole.yaml
index e4ce150ba..50128c0e1 100644
--- a/manifests/charts/aeraki/templates/clusterrole.yaml
+++ b/manifests/charts/aeraki/templates/clusterrole.yaml
@@ -18,7 +18,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 rules:
   - apiGroups:
       - ""
diff --git a/manifests/charts/aeraki/templates/clusterrolebinding.yaml b/manifests/charts/aeraki/templates/clusterrolebinding.yaml
index 896e78a83..4204a636a 100644
--- a/manifests/charts/aeraki/templates/clusterrolebinding.yaml
+++ b/manifests/charts/aeraki/templates/clusterrolebinding.yaml
@@ -18,12 +18,12 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: aeraki
-  name: aeraki
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: aeraki
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 subjects:
   - kind: ServiceAccount
     name: aeraki
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
diff --git a/manifests/charts/aeraki/templates/deployment.yaml b/manifests/charts/aeraki/templates/deployment.yaml
index d48978b35..5df8849af 100644
--- a/manifests/charts/aeraki/templates/deployment.yaml
+++ b/manifests/charts/aeraki/templates/deployment.yaml
@@ -17,7 +17,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: aeraki
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
   labels:
     app: aeraki
 spec:
diff --git a/manifests/charts/aeraki/templates/role.yaml b/manifests/charts/aeraki/templates/role.yaml
index aeff76a88..9d33fe657 100644
--- a/manifests/charts/aeraki/templates/role.yaml
+++ b/manifests/charts/aeraki/templates/role.yaml
@@ -18,8 +18,8 @@ kind: Role
 metadata:
   labels:
     app: aeraki
-  name: aeraki
-  namespace: {{ .Release.Namespace }}
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 rules:
   - apiGroups:
       - ""
diff --git a/manifests/charts/aeraki/templates/rolebinding.yaml b/manifests/charts/aeraki/templates/rolebinding.yaml
index 7ae7b9e9e..c3a367841 100644
--- a/manifests/charts/aeraki/templates/rolebinding.yaml
+++ b/manifests/charts/aeraki/templates/rolebinding.yaml
@@ -18,12 +18,12 @@ kind: RoleBinding
 metadata:
   labels:
     app: aeraki
-  name: aeraki
-  namespace: {{ .Release.Namespace }}
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: aeraki
+  name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 subjects:
   - kind: ServiceAccount
     name: aeraki
diff --git a/manifests/charts/aeraki/templates/service.yaml b/manifests/charts/aeraki/templates/service.yaml
index 2933a84d9..3b8be97a5 100644
--- a/manifests/charts/aeraki/templates/service.yaml
+++ b/manifests/charts/aeraki/templates/service.yaml
@@ -18,7 +18,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: aeraki
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
   labels:
     app: aeraki
 spec:
@@ -39,7 +39,7 @@ metadata:
   labels:
     app: aeraki
   name: aeraki
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
 spec:
   ports:
     - name: grpc-xds
diff --git a/manifests/charts/aeraki/templates/serviceaccount.yaml b/manifests/charts/aeraki/templates/serviceaccount.yaml
index e3ac5751b..4f882223a 100644
--- a/manifests/charts/aeraki/templates/serviceaccount.yaml
+++ b/manifests/charts/aeraki/templates/serviceaccount.yaml
@@ -18,7 +18,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: aeraki
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
   labels:
     app: aeraki
 {{- end }}
diff --git a/manifests/charts/aeraki/values.yaml b/manifests/charts/aeraki/values.yaml
index 6ef0d9580..13de1b737 100644
--- a/manifests/charts/aeraki/values.yaml
+++ b/manifests/charts/aeraki/values.yaml
@@ -26,6 +26,7 @@ image:
   tag: latest
 
 AERAKI_ENV:
+  AERAKI_NAMESPACE: "istio-system"
   AERAKI_IS_MASTER:
   AERAKI_ISTIOD_ADDR: "istiod.istio-system:15010"
   AERAKI_CLUSTER_ID: