diff --git a/charts/kaito/workspace/templates/clusterrole_binding.yaml b/charts/kaito/workspace/templates/clusterrole_binding.yaml
index 4451b3f5e..3076a4bfb 100644
--- a/charts/kaito/workspace/templates/clusterrole_binding.yaml
+++ b/charts/kaito/workspace/templates/clusterrole_binding.yaml
@@ -11,4 +11,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kaito.fullname" . }}-sa
-  namespace: {{ include "kaito.fullname" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/kaito/workspace/templates/nvidia-device-plugin-ds.yaml b/charts/kaito/workspace/templates/nvidia-device-plugin-ds.yaml
index 21974de27..850eb4562 100644
--- a/charts/kaito/workspace/templates/nvidia-device-plugin-ds.yaml
+++ b/charts/kaito/workspace/templates/nvidia-device-plugin-ds.yaml
@@ -63,7 +63,7 @@ apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
   name: high-priority-nonpreempting
-  namespace: {{ include "kaito.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kaito.labels" . | nindent 4 }}
 value: 1000000
diff --git a/charts/kaito/workspace/templates/role_binding.yaml b/charts/kaito/workspace/templates/role_binding.yaml
index 708b6b173..c67e6bc13 100644
--- a/charts/kaito/workspace/templates/role_binding.yaml
+++ b/charts/kaito/workspace/templates/role_binding.yaml
@@ -12,4 +12,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kaito.fullname" . }}-sa
-  namespace: {{ include "kaito.fullname" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/kaito/workspace/templates/webhooks.yaml b/charts/kaito/workspace/templates/webhooks.yaml
index 440804a72..9b501304b 100644
--- a/charts/kaito/workspace/templates/webhooks.yaml
+++ b/charts/kaito/workspace/templates/webhooks.yaml
@@ -10,7 +10,7 @@ webhooks:
     clientConfig:
       service:
         name: {{ include "kaito.fullname" . }}
-        namespace: {{ include "kaito.fullname" . }}
+        namespace: {{ .Release.Namespace }}
         port: {{ .Values.webhook.port }}
     failurePolicy: Fail
     sideEffects: None