diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index 3b9ed04f..4461203c 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.4
+version: 0.1.5
diff --git a/packages/apps/tenant/templates/2.yaml b/packages/apps/tenant/templates/tenant.yaml
similarity index 93%
rename from packages/apps/tenant/templates/2.yaml
rename to packages/apps/tenant/templates/tenant.yaml
index 768cccbe..c2260f5f 100644
--- a/packages/apps/tenant/templates/2.yaml
+++ b/packages/apps/tenant/templates/tenant.yaml
@@ -1,3 +1,6 @@
+{{- if ne (len (splitList "-" .Release.Name)) 1 }}
+{{- fail (printf "Release name should not contain dashes: %s" .Release.Name) }}
+{{- end }}
 {{- $tenantName := (printf "tenant-%s" .Release.Name) }}
 {{- if hasPrefix "tenant-" .Release.Namespace }}
 {{- $tenantName = (printf "%s-%s" .Release.Namespace .Release.Name) }}
diff --git a/packages/apps/versions_map b/packages/apps/versions_map
index 39ad18a9..e47790f9 100644
--- a/packages/apps/versions_map
+++ b/packages/apps/versions_map
@@ -6,10 +6,9 @@ postgres 0.1.0 HEAD
 rabbitmq 0.1.0 HEAD
 redis 0.1.0 HEAD
 tcp-balancer 0.1.0 HEAD
-tenant 0.1.1 
-tenant 0.1.2 
 tenant 0.1.3 3d1b86c
-tenant 0.1.4 HEAD
+tenant 0.1.4 d200480
+tenant 0.1.5 HEAD
 virtual-machine 0.1.4 f2015d6
 virtual-machine 0.1.5 HEAD
 vpn 0.1.0 HEAD