diff --git a/charts/kalavai-watcher/Chart.yaml b/charts/kalavai-watcher/Chart.yaml
index 2705a7f..181326b 100644
--- a/charts/kalavai-watcher/Chart.yaml
+++ b/charts/kalavai-watcher/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/kalavai-watcher/templates/cluster_role.yaml b/charts/kalavai-watcher/templates/cluster_role.yaml
index ac144e1..9b322c7 100644
--- a/charts/kalavai-watcher/templates/cluster_role.yaml
+++ b/charts/kalavai-watcher/templates/cluster_role.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: api-cluster-role
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
         - ""
diff --git a/charts/kalavai-watcher/templates/cluster_role_binding.yaml b/charts/kalavai-watcher/templates/cluster_role_binding.yaml
index 6d53e2f..0d0a58f 100644
--- a/charts/kalavai-watcher/templates/cluster_role_binding.yaml
+++ b/charts/kalavai-watcher/templates/cluster_role_binding.yaml
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   name: api-cluster-role-binding
 subjects:
-- namespace: {{ .Values.namespace }}
+- namespace: {{ .Release.Namespace }}
   kind: ServiceAccount
   name: api-service-account 
 roleRef:
diff --git a/charts/kalavai-watcher/templates/deployment.yaml b/charts/kalavai-watcher/templates/deployment.yaml
index cf38bec..cd9d3fd 100644
--- a/charts/kalavai-watcher/templates/deployment.yaml
+++ b/charts/kalavai-watcher/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kube-watcher-api
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1 # ensure there is minimal downtime if node goes down
   selector:
@@ -21,9 +21,9 @@ spec:
         - containerPort: 8000
         env:
         - name: IN_CLUSTER
-          value: {{ .Values.deployment.in_cluster }}
+          value: "{{ .Values.deployment.in_cluster }}"
         - name: KW_USE_AUTH
-          value: {{ .Values.deployment.use_auth_key }}
+          value: "{{ .Values.deployment.use_auth_key }}"
         - name: KW_MASTER_KEY
           value: {{ .Values.deployment.auth_key }}
         livenessProbe:
diff --git a/charts/kalavai-watcher/templates/service.yaml b/charts/kalavai-watcher/templates/service.yaml
index 4bb8811..b1b9384 100644
--- a/charts/kalavai-watcher/templates/service.yaml
+++ b/charts/kalavai-watcher/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kube-watcher-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: NodePort
   ports:
diff --git a/charts/kalavai-watcher/templates/service_account.yaml b/charts/kalavai-watcher/templates/service_account.yaml
index 81806b2..420ac8a 100644
--- a/charts/kalavai-watcher/templates/service_account.yaml
+++ b/charts/kalavai-watcher/templates/service_account.yaml
@@ -3,4 +3,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: api-service-account
-  namespace: {{ .Values.namespace }}
\ No newline at end of file
+  namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/charts/kalavai-watcher/values.yaml b/charts/kalavai-watcher/values.yaml
index 94fff25..d282900 100644
--- a/charts/kalavai-watcher/values.yaml
+++ b/charts/kalavai-watcher/values.yaml
@@ -1,5 +1,3 @@
-namespace: kalavai
-
 deployment:
   in_cluster: "True"
   use_auth_key: "True"