diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 1d34e9f..eb61db9 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -30,21 +30,39 @@
   #
 
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: ${ZOOKEEPER_IMAGE_FULL_NAME}
     ports:
       - "2181:2181"
     networks:
       - hv-ves-default
 
   kafka:
-    image: wurstmeister/kafka
+    image: ${KAFKA_IMAGE_FULL_NAME}
     ports:
       - "9092:9092"
+      - "9093:9093"
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      HOST_IP: 127.0.0.1
+      KAFKA_BROKER_ID: 0
+      ENDPOINT_PORT: 30490
       KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
-      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_DELETE_TOPIC_ENABLE: "true"
+
+      KAFKA_LISTENERS: "INTERNAL_SASL_PLAINTEXT://0.0.0.0:9092,EXTERNAL_SASL_PLAINTEXT://0.0.0.0:9093"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL_SASL_PLAINTEXT://:9092,EXTERNAL_SASL_PLAINTEXT://:9093"
+      KAFKA_ADVERTISED_HOST_NAME: "kafka"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL_SASL_PLAINTEXT"
+      KAFKA_SASL_ENABLED_MECHANISMS: "PLAIN"
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: "PLAIN"
+      KAFKA_AUTHORIZER_CLASS_NAME: "org.onap.dmaap.kafkaAuthorize.KafkaCustomAuthorizer"
+
+      aaf_locate_url: https://aaf-locate:8095
+      KAFKA_LOG_DIRS: /opt/kafka/data
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_DEFAULT_REPLICATION_FACTOR: 1
+      KAFKA_NUM_PARTITIONS: 1
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index 0531484..c9e3ff0 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -24,8 +24,13 @@
 export CONSUL_HOST="consul-server"
 export CONFIG_BINDING_SERVICE="config-binding-service"
 
-export DOCKER_REGISTRY="nexus3.onap.org:10001"
+export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
+export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
 export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
+
+export KAFKA_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/kafka111:0.0.6"
+export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0"
+
 export CONTAINERS_NETWORK="hv-ves-default"
 export HV_VES_SERVICE_NAME="hv-ves-collector"
 export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
index 20b538b..a2ae335 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -24,8 +24,13 @@
 export CONSUL_HOST="consul-server"
 export CONFIG_BINDING_SERVICE="config-binding-service"
 
+export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
 export DOCKER_REGISTRY="docker.io"
 export DOCKER_REGISTRY_PREFIX=""
+
+export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
+export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0"
+
 export CONTAINERS_NETWORK="hv-ves-default"
 export HV_VES_SERVICE_NAME="hv-ves-collector"
 export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
@@ -38,4 +43,3 @@
 export HV_VES_IMAGE="hv-collector-main"
 export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
 export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator"
-
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
index 73fdbc2..eb7764e 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
@@ -48,5 +48,6 @@
 cd ../..
 
 docker-compose up -d
+docker images --digests
 
 mkdir -p ${WORKSPACE}/archives/containers_logs
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py
index e262ff0..5c9ffb1 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py
@@ -17,9 +17,10 @@
 # ============LICENSE_END=====================================
 
 import docker
+import os
 from robot.api import logger
 
-KAFKA_IMAGE_FULL_NAME = "wurstmeister/kafka"
+KAFKA_IMAGE_FULL_NAME = os.getenv("KAFKA_IMAGE_FULL_NAME")
 KAFKA_ADDRESS = "kafka:9092"
 ZOOKEEPER_ADDRESS = "zookeeper:2181"
 
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration-with-different-topic.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration-with-different-topic.json
index d3d1f4c..7cd830d 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration-with-different-topic.json
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration-with-different-topic.json
@@ -2,6 +2,10 @@
   "streams_publishes": {
     "perf3gpp": {
       "type": "kafka",
+      "aaf_credentials": {
+        "username": "admin",
+        "password": "admin_secret"
+      },
       "kafka_info": {
         "bootstrap_servers": "kafka:9092",
         "topic_name": "TEST_HV_VES_PERF3GPP_BUT_WITH_EXTRA_WORDS"
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
index 1c4e343..d932b7d 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
@@ -2,6 +2,10 @@
   "streams_publishes": {
     "perf3gpp": {
       "type": "kafka",
+      "aaf_credentials": {
+        "username": "admin",
+        "password": "admin_secret"
+      },
       "kafka_info": {
         "bootstrap_servers": "kafka:9092",
         "topic_name": "TEST_HV_VES_PERF3GPP"