diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index ba43dec9b..5cdf7ab4b 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -237,11 +237,15 @@ Expand the name of the chart.
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
 */}}
 {{- define "<CHARTNAME>.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- $default := printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- default $default .Values.fullnameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 {{- end -}}
 `