diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
index e6226780..229bc4dc 100644
--- a/kafka/50kafka.yml
+++ b/kafka/50kafka.yml
@@ -3,7 +3,6 @@ kind: StatefulSet
 metadata:
   name: kafka
   namespace: kafka
-spec:
 spec:
   selector:
     matchLabels:
diff --git a/kafka/test/kafkacat.yml b/kafka/test/kafkacat.yml
index 8d6c64e8..f73735d0 100644
--- a/kafka/test/kafkacat.yml
+++ b/kafka/test/kafkacat.yml
@@ -115,7 +115,7 @@ spec:
         image: solsson/kafkacat@sha256:b32eedf936f3cde44cd164ddc77dfcf7565a8af4e357ff6de1abe4389ca530c9
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         command:
         - /bin/bash
         - -cex
@@ -134,7 +134,7 @@ spec:
         image: solsson/kafkacat@sha256:b32eedf936f3cde44cd164ddc77dfcf7565a8af4e357ff6de1abe4389ca530c9
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         command:
         - /bin/bash
         - -cex
diff --git a/kafka/test/produce-consume.yml b/kafka/test/produce-consume.yml
index a326f01a..4b1435b4 100644
--- a/kafka/test/produce-consume.yml
+++ b/kafka/test/produce-consume.yml
@@ -98,7 +98,7 @@ spec:
         image: solsson/kafka:1.0.0@sha256:17fdf1637426f45c93c65826670542e36b9f3394ede1cb61885c6a4befa8f72d
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         command:
         - /bin/bash
         - -cex
@@ -117,7 +117,7 @@ spec:
         image: solsson/kafka:1.0.0@sha256:17fdf1637426f45c93c65826670542e36b9f3394ede1cb61885c6a4befa8f72d
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         command:
         - /bin/bash
         - -cex
@@ -134,7 +134,7 @@ spec:
         image: solsson/kafkacat@sha256:ebebf47061300b14a4b4c2e1e4303ab29f65e4b95d34af1b14bb8f7ec6da7cef
         env:
         - name: BOOTSTRAP
-          value: kafka-0.broker.kafka.svc.cluster.local:9092
+          value: bootstrap.kafka:9092
         command:
         - /bin/bash
         - -e
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index a57dd1f7..d965ad1b 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -3,7 +3,6 @@ kind: StatefulSet
 metadata:
   name: pzoo
   namespace: kafka
-spec:
 spec:
   selector:
     matchLabels: