diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index 1dca128d..585a0cd9 100644
--- a/packages/apps/tenant/Chart.yaml
+++ b/packages/apps/tenant/Chart.yaml
@@ -4,4 +4,4 @@ description: Separated tenant namespace
 icon: /logos/tenant.svg
 
 type: application
-version: 1.6.1
+version: 1.6.2
diff --git a/packages/apps/tenant/templates/kubeconfig.yaml b/packages/apps/tenant/templates/kubeconfig.yaml
index 601945f0..408bc8c7 100644
--- a/packages/apps/tenant/templates/kubeconfig.yaml
+++ b/packages/apps/tenant/templates/kubeconfig.yaml
@@ -27,7 +27,7 @@ stringData:
         namespace: {{ include "tenant.name" . }}
         user: keycloak
       name: {{ include "tenant.name" . }}
-    current-context: default
+    current-context: {{ include "tenant.name" . }}
     users:
     - name: keycloak
       user:
@@ -40,6 +40,5 @@ stringData:
           - --oidc-client-id=kubernetes
           - --oidc-client-secret={{ $k8sClient }}
           - --skip-open-browser
-          - --grant-type=password
           command: kubectl
 {{- end }}
diff --git a/packages/apps/versions_map b/packages/apps/versions_map
index 573c9921..a506edbd 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -90,7 +90,8 @@ tenant 1.3.1 c56e5769
 tenant 1.4.0 94c688f7
 tenant 1.5.0 48128743
 tenant 1.6.0 df448b99
-tenant 1.6.1 HEAD
+tenant 1.6.1 edbbb9be
+tenant 1.6.2 HEAD
 virtual-machine 0.1.4 f2015d6
 virtual-machine 0.1.5 7cd7de7
 virtual-machine 0.2.0 5ca8823