diff --git a/packages/apps/gen_versions_map.sh b/packages/apps/gen_versions_map.sh
index a9f9db77..1d9f1c5d 100755
--- a/packages/apps/gen_versions_map.sh
+++ b/packages/apps/gen_versions_map.sh
@@ -21,7 +21,7 @@ resolved_miss_map=$(
   echo "$miss_map" | while read chart version commit; do
     if [ "$commit" = HEAD ]; then
       line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}')
-      change_commit=$(git --no-pager blame -L20,+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}')
+      change_commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}')
       commit=$(git describe --always "$change_commit~1")
     fi
     echo "$chart $version $commit"
diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index 03572ee8..3b9ed04f 100644
--- a/packages/apps/tenant/Chart.yaml
+++ b/packages/apps/tenant/Chart.yaml
@@ -4,4 +4,4 @@ description: Additional tenant namespace
 icon: https://upload.wikimedia.org/wikipedia/commons/0/04/User_icon_1.svg
 
 type: application
-version: 0.1.2
+version: 0.1.4
diff --git a/packages/apps/tenant/templates/2.yaml b/packages/apps/tenant/templates/2.yaml
index 9a3e3611..768cccbe 100644
--- a/packages/apps/tenant/templates/2.yaml
+++ b/packages/apps/tenant/templates/2.yaml
@@ -1,28 +1,33 @@
+{{- $tenantName := (printf "tenant-%s" .Release.Name) }}
+{{- if hasPrefix "tenant-" .Release.Namespace }}
+{{- $tenantName = (printf "%s-%s" .Release.Namespace .Release.Name) }}
+{{- end }}
+---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
   annotations:
-    kubernetes.io/service-account.name: tenant-{{ .Release.Name }}
+    kubernetes.io/service-account.name: {{ $tenantName }}
 type: kubernetes.io/service-account-token
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
 rules:
 - apiGroups: [""]
   resources: ["*"]
@@ -34,37 +39,31 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
 subjects:
+{{- if hasPrefix "tenant-" .Release.Namespace }}
+{{- $parts := splitList "-" .Release.Namespace }}
+{{- range $i, $v := $parts }}
+{{- if ne $i 0 }}
 - kind: ServiceAccount
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
-roleRef:
-  kind: Role
-  name: tenant-{{ .Release.Name }}
-  apiGroup: rbac.authorization.k8s.io
-{{ if hasPrefix .Release.Namespace "tenant-" }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ .Release.Namespace }}
-  namespace: tenant-{{ .Release.Name }}
-subjects:
-- kind: ServiceAccount
-  name: {{ .Release.Namespace }}
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: tenant-{{ .Release.Name }}
-  apiGroup: rbac.authorization.k8s.io
+  name: {{ join "-" (slice $parts 0 (add $i 1)) }}
+  namespace: {{ join "-" (slice $parts 0 (add $i 1)) }}
 {{- end }}
+{{- end }}
+{{- end }}
+- kind: ServiceAccount
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
+roleRef:
+  kind: Role
+  name: {{ $tenantName }}
+  apiGroup: rbac.authorization.k8s.io
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
   namespace: cozy-public
 rules:
 - apiGroups: ["source.toolkit.fluxcd.io"]
@@ -77,13 +76,13 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
   namespace: cozy-public
 subjects:
 - kind: ServiceAccount
-  name: tenant-{{ .Release.Name }}
-  namespace: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
+  namespace: {{ $tenantName }}
 roleRef:
   kind: Role
-  name: tenant-{{ .Release.Name }}
+  name: {{ $tenantName }}
   apiGroup: rbac.authorization.k8s.io
diff --git a/packages/apps/versions_map b/packages/apps/versions_map
index a84f0b70..39ad18a9 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -7,7 +7,9 @@ rabbitmq 0.1.0 HEAD
 redis 0.1.0 HEAD
 tcp-balancer 0.1.0 HEAD
 tenant 0.1.1 
-tenant 0.1.2 HEAD
+tenant 0.1.2 
+tenant 0.1.3 3d1b86c
+tenant 0.1.4 HEAD
 virtual-machine 0.1.4 f2015d6
 virtual-machine 0.1.5 HEAD
 vpn 0.1.0 HEAD