diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index acc63b364e..c56364dba3 100755
--- a/incubator/kafka/Chart.yaml
+++ b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.5.0
+version: 0.5.1
 appVersion: 4.0.0
 keywords:
 - kafka
diff --git a/incubator/kafka/templates/jmx-configmap.yaml b/incubator/kafka/templates/jmx-configmap.yaml
index fbb465190d..872030e94c 100644
--- a/incubator/kafka/templates/jmx-configmap.yaml
+++ b/incubator/kafka/templates/jmx-configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "kafka.configmap" . }}-metrics
+  name: {{ template "kafka.fullname" . }}-metrics
   labels:
     app: "{{ template "kafka.name" . }}"
     release: {{ .Release.Name | quote }}
diff --git a/incubator/kafka/templates/statefulset.yaml b/incubator/kafka/templates/statefulset.yaml
index f1be768e3f..5e9bd5f488 100644
--- a/incubator/kafka/templates/statefulset.yaml
+++ b/incubator/kafka/templates/statefulset.yaml
@@ -171,7 +171,7 @@ spec:
       {{- if .Values.metrics.jmx.enabled }}
       - name: jmx-config
         configMap:
-          name: {{ template "kafka.configmap" . }}-metrics
+          name: {{ template "kafka.fullname" . }}-metrics
       {{- end }}
   {{- if .Values.persistence.enabled }}
   volumeClaimTemplates: