diff --git a/tools/performance/cloud/cloud-based-performance-test.sh b/tools/performance/cloud/cloud-based-performance-test.sh
index 2365cc4..791a41c 100755
--- a/tools/performance/cloud/cloud-based-performance-test.sh
+++ b/tools/performance/cloud/cloud-based-performance-test.sh
@@ -41,8 +41,8 @@ HVVES_CERT_PATH=/etc/ves-hv/ssl/server
 KAFKA_RETENTION_TIME_MINUTES=60
 MILISECONDS_IN_MINUTE=60000
 CALC_RETENTION_TIME_IN_MS_CMD='expr $KAFKA_RETENTION_TIME_MINUTES \* $MILISECONDS_IN_MINUTE'
-KAFKA_ROUTER_0_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep router-kafka-0)
-KAFKA_SET_TOPIC_RETENTION_TIME_CMD='kafka-topics --zookeeper message-router-zookeeper:2181 --alter --topic HV_VES_PERF3GPP --config retention.ms='
+KAFKA_ROUTER_0_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep broker0)
+KAFKA_SET_TOPIC_RETENTION_TIME_CMD='kafka-topics.sh --zookeeper zoo1:2181 --alter --topic HV_VES_PERF3GPP --config retention.ms='
 HIDE_OUTPUT='grep abc | grep 123'
 
 function clean() {
diff --git a/tools/performance/cloud/configure-consul.sh b/tools/performance/cloud/configure-consul.sh
index 1465a5f..eea5da5 100755
--- a/tools/performance/cloud/configure-consul.sh
+++ b/tools/performance/cloud/configure-consul.sh
@@ -43,7 +43,7 @@ STATUS=$(kubectl exec -n onap ${HVVES_POD_NAME} --container=dcae-hv-ves-collecto
             "password": "admin_secret"
             },
         "kafka_info": {
-            "bootstrap_servers": "message-router-kafka:9092",
+            "bootstrap_servers": "kafka-service:9092",
             "topic_name": "HV_VES_PERF3GPP"
             }
         }
diff --git a/tools/performance/cloud/reboot-test-environment.sh b/tools/performance/cloud/reboot-test-environment.sh
index f2dedf5..d7fbcb0 100755
--- a/tools/performance/cloud/reboot-test-environment.sh
+++ b/tools/performance/cloud/reboot-test-environment.sh
@@ -21,8 +21,8 @@ ONAP_NAMESPACE=onap
 HVVES_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep hv-ves-collector)
 HVVES_CONTAINER_NAME=dep-dcae-hv-ves-collector
 HV_VES_IMAGE="nexus.onap.dyn.nesc.nokia.net:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest"
-KAFKA_ROUTER_0_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep router-kafka-0)
-KAFKA_TOPIC_RESET_CMD='kafka-topics --delete --zookeeper message-router-zookeeper:2181 --topic HV_VES_PERF3GPP'
+KAFKA_ROUTER_0_POD_NAME=$(kubectl -n ${ONAP_NAMESPACE} get pods --no-headers=true -o custom-columns=:metadata.name | grep broker0)
+KAFKA_TOPIC_RESET_CMD='kafka-topics.sh --delete --zookeeper zoo1:2181 --topic HV_VES_PERF3GPP'
 HIDE_OUTPUT='grep abc | grep 123'
 YELLOW=$(tput setaf 3)
 GREEN=$(tput setaf 2)
diff --git a/tools/performance/cloud/test.properties b/tools/performance/cloud/test.properties
index 53a38e2..2754b13 100644
--- a/tools/performance/cloud/test.properties
+++ b/tools/performance/cloud/test.properties
@@ -17,6 +17,6 @@ client.cert.pass.path=/ssl/client.pass
 # CONSUMER CONFIGURATION
 
 # Addresses of Kafka services to consume from
-consumer.kafka.bootstrapServers=message-router-kafka:9092
+consumer.kafka.bootstrapServers=kafka-service:9092
 # Kafka topics to subscribe to
 consumer.kafka.topics=HV_VES_PERF3GPP