diff --git a/charts/k3k/Chart.yaml b/charts/k3k/Chart.yaml
index 25600a1..6596d83 100644
--- a/charts/k3k/Chart.yaml
+++ b/charts/k3k/Chart.yaml
@@ -3,4 +3,4 @@ name: k3k
 description: A Helm chart for K3K
 type: application
 version: 0.1.5-r5
-appVersion: 0.2.0
+appVersion: v0.2.2-rc2
diff --git a/charts/k3k/templates/deployment.yaml b/charts/k3k/templates/deployment.yaml
index 9e749d9..e0df1dd 100644
--- a/charts/k3k/templates/deployment.yaml
+++ b/charts/k3k/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "k3k.fullname" . }}
   labels:
     {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.image.replicaCount }}
   selector:
@@ -16,14 +16,14 @@ spec:
         {{- include "k3k.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-        - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        - image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: {{ .Chart.Name }}
           env:
           - name: CLUSTER_CIDR
             value: {{ .Values.host.clusterCIDR }}
           - name: SHARED_AGENT_IMAGE
-            value: "{{ .Values.sharedAgent.image.repository }}:{{ .Values.sharedAgent.image.tag }}"
+            value: "{{ .Values.sharedAgent.image.repository }}:{{ default .Chart.AppVersion .Values.sharedAgent.image.tag }}"
           ports:
           - containerPort: 8080
             name: https
diff --git a/charts/k3k/templates/namespace.yaml b/charts/k3k/templates/namespace.yaml
deleted file mode 100644
index 59f7944..0000000
--- a/charts/k3k/templates/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Values.namespace }}
\ No newline at end of file
diff --git a/charts/k3k/templates/rbac.yaml b/charts/k3k/templates/rbac.yaml
index 6dcca90..d5e00f0 100644
--- a/charts/k3k/templates/rbac.yaml
+++ b/charts/k3k/templates/rbac.yaml
@@ -11,7 +11,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "k3k.serviceAccountName" . }}
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/charts/k3k/templates/service.yaml b/charts/k3k/templates/service.yaml
index a777d82..3217995 100644
--- a/charts/k3k/templates/service.yaml
+++ b/charts/k3k/templates/service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: k3k-webhook
   labels:
     {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
     - port: 443
diff --git a/charts/k3k/templates/serviceaccount.yaml b/charts/k3k/templates/serviceaccount.yaml
index 30deaa0..c2e84c8 100644
--- a/charts/k3k/templates/serviceaccount.yaml
+++ b/charts/k3k/templates/serviceaccount.yaml
@@ -5,5 +5,5 @@ metadata:
   name: {{ include "k3k.serviceAccountName" . }}
   labels:
     {{- include "k3k.labels" . | nindent 4 }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
\ No newline at end of file
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/k3k/values.yaml b/charts/k3k/values.yaml
index 4fcb08a..26a6bad 100644
--- a/charts/k3k/values.yaml
+++ b/charts/k3k/values.yaml
@@ -1,19 +1,17 @@
 replicaCount: 1
-namespace: k3k-system
 
 image:
-  repository: rancher/k3k 
-  pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "v0.2.1"
+  repository: rancher/k3k
+  tag: ""
+  pullPolicy: ""
 
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
 host:
-# clusterCIDR specifies the clusterCIDR that will be added to the default networkpolicy for clustersets, if not set
-# the controller will collect the PodCIDRs of all the nodes on the system.
+  # clusterCIDR specifies the clusterCIDR that will be added to the default networkpolicy for clustersets, if not set
+  # the controller will collect the PodCIDRs of all the nodes on the system.
   clusterCIDR: ""
 
 serviceAccount:
@@ -26,5 +24,5 @@ serviceAccount:
 # configuration related to the shared agent mode in k3k
 sharedAgent:
   image:
-    repository: "rancher/k3k"
-    tag: "k3k-kubelet-dev"
\ No newline at end of file
+    repository: "rancher/k3k-kubelet"
+    tag: ""