diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
index 50b8a91..bed9742 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
@@ -33,10 +33,15 @@
 
 set +e
 
-METRICS_FILE=${WORKSPACE}/archives/containers_logs/hv-ves-metrics.dump
+METRICS_FILE=${WORKSPACE}/archives/containers_logs/collector-metrics.dump
 docker-compose exec hv-ves-collector curl -qs localhost:6060/monitoring/prometheus > ${METRICS_FILE}
 
-COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log
+CONTAINER_LOGS=${WORKSPACE}/archives/containers_logs/
+COMPOSE_LOGS_FILE=${CONTAINER_LOGS}/docker-compose.log
+
+docker-compose logs hv-ves-collector > ${CONTAINER_LOGS}/hv-ves-collector.log
+docker-compose logs unencrypted-hv-ves-collector > ${CONTAINER_LOGS}/unencrypted-hv-ves-collector.log
+docker-compose logs dcae-app-simulator > ${CONTAINER_LOGS}/dcae-app-simulator.log
 docker-compose logs > ${COMPOSE_LOGS_FILE}
 docker-compose down
 docker-compose rm -f