diff --git a/k8s.yml b/k8s.yml
index ae14ae2..de3bf3d 100644
--- a/k8s.yml
+++ b/k8s.yml
@@ -41,13 +41,12 @@ spec:
       image: docker-registry:443/wasm-pong/kafka
       ports:
         - containerPort: 9092
-          name: boot-svc-1
-        - containerPort: 9093
-          name: boot-svc-2
+          name: bootstrap-svc
         - containerPort: 7243
           name: topic-svc
       env:
         - name: KAFKA_BROKER_ID
+          # TODO: How to manage the broker id with multiple replicas?
           value: "1"
         - name: KAFKA_CFG_INTER_BROKER_LISTENER_NAME
           value: K8S
@@ -69,3 +68,20 @@ spec:
             - "--describe"
         initialDelaySeconds: 10
         periodSeconds: 30
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kafka-service
+spec:
+  selector:
+    wasm.pong.io/name: kafka
+  ports:
+    - name: kafka-service-port
+      protocol: TCP
+      port: 9092
+      targetPort: bootstrap-svc
+    - name: kafka-topic-service-port
+      protocol: TCP
+      port: 7243
+      targetPort: topic-svc