diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index a0e80bfbd5..349361832b 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.2.10
+version: 0.2.11
 keywords:
 - kafka
 - zookeeper
diff --git a/incubator/kafka/README.md b/incubator/kafka/README.md
index 6bb8fc5ff8..552bb187c3 100644
--- a/incubator/kafka/README.md
+++ b/incubator/kafka/README.md
@@ -67,9 +67,6 @@ following configurable parameters:
 | `schema-registry.enabled`      | If True, installs Schema Registry Chart                                                                                                          | `false`                                                    |
 | `updateStrategy`               | The type of StatefulSet update strategy to use. One of `OnDelete` or `RollingUpdate`                                   | `OnDelete`                                                 |
 | `rollingUpdatePartition`       | When `RollingUpdate` is the `updateStrategy`, which `partition` of the statefulset is updated first.                   | `0`                                                        |
-| `zookeeperAntiAffinityEnabled` | If `true`, apply anti-affinity rules between kafka and zookeeper pods.                                                                           | `true`                                                     |
-| `zookeeperAntiAffinity`        | If `hard` disallow colocation of Kafka and Zookeeper pods, if `soft`, make a best effort-attempt to prevent colocation                           | `soft`                                                     |
-| `zookeeperAntiAffinityPodName` | Pod Metadata app label of zookeeper pods for anti-affinity rules for use with `In` prefix of affinity rules.                                     | `zookeeper`                                                |
 | `zookeeper.enabled`            | If True, installs Zookeeper Chart                                                                                                                | `true`                                                     |
 | `zookeeper.url`                | URL of Zookeeper Cluster (unneeded if installing Zookeeper Chart)                                                                                | `""`                                                       |
 | `zookeeper.port`               | Port of Zookeeper Cluster                                                                                                                        | `2181`                                                     |
diff --git a/incubator/kafka/templates/_helpers.tpl b/incubator/kafka/templates/_helpers.tpl
index 94c7674fb5..57b0d26e45 100644
--- a/incubator/kafka/templates/_helpers.tpl
+++ b/incubator/kafka/templates/_helpers.tpl
@@ -15,6 +15,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create a default fully qualified zookeeper name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "kafka.zookeeper.fullname" -}}
+{{- $name := default "zookeeper" .Values.zookeeper.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create the name for our kafka configmap.
 */}}
@@ -29,7 +38,7 @@ else use user-provided URL
 {{- define "zookeeper.url" }}
 {{- $port := .Values.zookeeper.port | toString }}
 {{- if .Values.zookeeper.enabled -}}
-{{- printf "%s-zookeeper:%s" .Release.Name $port }}
+{{- printf "%s:%s" (include "kafka.zookeeper.fullname" .) $port }}
 {{- else -}}
 {{- printf "%s:%s" .Values.zookeeper.url $port }}
 {{- end -}}