diff --git a/scripts/ced b/scripts/ced
index 77b0953..1d85473 100755
--- a/scripts/ced
+++ b/scripts/ced
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -x
-NAME=${1:-bbsim}
-exec voltctl device enable $(voltctl device create -t openolt -H bbsim.voltha.svc:50060)
+BBSIM=$(kubectl get --all-namespaces -l app=bbsim svc -o json | jq -r '.items[] | .metadata.name + "." + .metadata.namespace + ".svc:50060"' | head -1)
+exec voltctl device enable "$(voltctl device create -t openolt -H "$BBSIM")"
diff --git a/voltha b/voltha
index ba85f84..a472c0a 100755
--- a/voltha
+++ b/voltha
@@ -110,6 +110,7 @@
 VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION=${VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION:-latest}
 ONOS_CHART=${ONOS_CHART:-onf/onos}
 ONOS_CHART_VERSION=${ONOS_CHART_VERSION:-latest}
+KAFKA_CHART_VERSION=${KAFKA_CHART_VERSION:=0.15.3}
 EXTRA_HELM_INSTALL_ARGS=${EXTRA_HELM_INSTALL_ARGS:-}
 INTERNAL_EXTRA_HELM_INSTALL_ARGS=
 NUM_OF_BBSIM=${NUM_OF_BBSIM:-1}
@@ -250,6 +251,7 @@
     VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION \
     ONOS_CHART \
     ONOS_CHART_VERSION \
+    KAFKA_CHART_VERSION \
     ONOS_API_PORT \
     ONOS_SSH_PORT \
     CONFIG_SADIS \
@@ -1585,7 +1587,7 @@
     if [ "$HELM_USE_UPGRADE" == "yes" ] || [ "$(helm list --deployed --short --namespace "$INFRA_NS" "^kafka\$" | wc -l)" -ne 1 ]; then
         espin "$NOT_VERIFIED"
         INTERNAL_EXTRA_HELM_INSTALL_ARGS+=" -f $_TMP"
-        helm_install - "$INFRA_NS" kafka incubator/kafka latest "$_HELM_DESC external Kafka cluster"
+        helm_install - "$INFRA_NS" kafka incubator/kafka "$KAFKA_CHART_VERSION" "$_HELM_DESC external Kafka cluster"
     else
         espin "$VERIFIED"
     fi