diff --git a/incubator/schema-registry/Chart.yaml b/incubator/schema-registry/Chart.yaml
index abc240ab42..71017bd812 100644
--- a/incubator/schema-registry/Chart.yaml
+++ b/incubator/schema-registry/Chart.yaml
@@ -1,6 +1,6 @@
 name: schema-registry
 home: https://docs.confluent.io/current/schema-registry/docs/index.html
-version: 1.1.0
+version: 1.1.1
 appVersion: 5.0.1
 keywords:
   - confluent
diff --git a/incubator/schema-registry/templates/_helpers.tpl b/incubator/schema-registry/templates/_helpers.tpl
index 2a17d2d13f..2fe0a2d0d7 100644
--- a/incubator/schema-registry/templates/_helpers.tpl
+++ b/incubator/schema-registry/templates/_helpers.tpl
@@ -9,11 +9,20 @@ 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 "schema-registry.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{/*
 Form the Kafka URL. If Kafka is installed as part of this chart, use k8s service discovery,