diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
index 1e79611..36af568 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
@@ -72,3 +72,13 @@
   persistence:
     enabled: false
 
+# Overwrite service endpoints for kafka and etcd to match the ones deployed in
+# voltha-infra
+services:
+  kafka:
+    cluster:
+      address: voltha-infra-kafka.infra.svc:9092
+
+  # Define connectivity to etcd
+  etcd:
+    address: voltha-infra-etcd.infra.svc:2379