diff --git a/charts/manila-csi-plugin/Chart.yaml b/charts/manila-csi-plugin/Chart.yaml
index b396be2aad..91b2c56185 100644
--- a/charts/manila-csi-plugin/Chart.yaml
+++ b/charts/manila-csi-plugin/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.32.0
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 2.33.0-alpha.0
+version: 2.33.0-alpha.1
 home: http://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:
diff --git a/charts/manila-csi-plugin/templates/controllerplugin-role.yaml b/charts/manila-csi-plugin/templates/controllerplugin-role.yaml
index 36a67f9921..c3cff29aac 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-role.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-role.yaml
@@ -2,6 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "openstack-manila-csi.controllerplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.controllerplugin.labels" .  | nindent 4 }}
 rules:
diff --git a/charts/manila-csi-plugin/templates/controllerplugin-rolebinding.yaml b/charts/manila-csi-plugin/templates/controllerplugin-rolebinding.yaml
index 31f9fb2610..f34d6062dd 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-rolebinding.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-rolebinding.yaml
@@ -2,6 +2,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "openstack-manila-csi.controllerplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.controllerplugin.labels" .  | nindent 4 }}
 subjects:
diff --git a/charts/manila-csi-plugin/templates/controllerplugin-service.yaml b/charts/manila-csi-plugin/templates/controllerplugin-service.yaml
index 05d34e0539..e2f4bc0edf 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-service.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-service.yaml
@@ -2,6 +2,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: {{ include "openstack-manila-csi.controllerplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.controllerplugin.labels" .  | nindent 4 }}
 spec:
diff --git a/charts/manila-csi-plugin/templates/controllerplugin-serviceaccount.yaml b/charts/manila-csi-plugin/templates/controllerplugin-serviceaccount.yaml
index c976b9160b..3190363f39 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-serviceaccount.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-serviceaccount.yaml
@@ -2,5 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "openstack-manila-csi.serviceAccountName.controllerplugin" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.controllerplugin.labels" .  | nindent 4 }}
diff --git a/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml b/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
index e9263739e4..10bf168417 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml
@@ -2,6 +2,7 @@ kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: {{ include "openstack-manila-csi.controllerplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.controllerplugin.labels" .  | nindent 4 }}
 spec:
diff --git a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
index aa173cc53f..58e2944abe 100644
--- a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
+++ b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml
@@ -2,6 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: {{ include "openstack-manila-csi.nodeplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.nodeplugin.labels" .  | nindent 4 }}
 spec:
diff --git a/charts/manila-csi-plugin/templates/nodeplugin-serviceaccount.yaml b/charts/manila-csi-plugin/templates/nodeplugin-serviceaccount.yaml
index 1c7eaab7f8..1a2166f330 100644
--- a/charts/manila-csi-plugin/templates/nodeplugin-serviceaccount.yaml
+++ b/charts/manila-csi-plugin/templates/nodeplugin-serviceaccount.yaml
@@ -2,5 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "openstack-manila-csi.serviceAccountName.nodeplugin" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "openstack-manila-csi.nodeplugin.labels" .  | nindent 4 }}
diff --git a/charts/manila-csi-plugin/templates/runtimeconfig-cm.yaml b/charts/manila-csi-plugin/templates/runtimeconfig-cm.yaml
index d739ce1640..59c1a06572 100644
--- a/charts/manila-csi-plugin/templates/runtimeconfig-cm.yaml
+++ b/charts/manila-csi-plugin/templates/runtimeconfig-cm.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: manila-csi-runtimeconf-cm
+  namespace: {{ .Release.Namespace }}
 data:
   runtimeconfig.json: |-
 {{ .Values.csimanila.runtimeConfig.jsonData | indent 4 }}