diff --git a/test/csit/plans/music/music-test-plan/setup.sh b/test/csit/plans/music/music-test-plan/setup.sh
index 228aa1f..900ccf6 100755
--- a/test/csit/plans/music/music-test-plan/setup.sh
+++ b/test/csit/plans/music/music-test-plan/setup.sh
@@ -46,7 +46,7 @@
 echo "# music docker containers spinoff";
 
 
-docker volume create music-vol
+docker volume create --name music-vol
 docker run -d --name music-war -v music-vol:/app nexus3.onap.org:10001/onap/music/music:latest
 docker run -d --name music-db -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 nexus3.onap.org:10001/onap/music/cassandra_music:latest
 docker run -d --name music-zk -p 2181:2181 -p 2888:2888 -p 3888:3888 nexus3.onap.org:10001/library/zookeeper:3.4
@@ -61,10 +61,12 @@
 ${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${CASSA_IP} 9042
 
 docker run -d --name music-tomcat -p 8080:8080 -v music-vol:/usr/local/tomcat/webapps -v ${MUSIC_PROPERTIES}:/opt/app/music/etc:ro -v ${MUSIC_LOGS}:/opt/app/music/logs nexus3.onap.org:10001/library/tomcat:8.0
+sleep 10
 
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
+${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
 
 --- old part: it will be removed
@@ -80,7 +82,7 @@
 # add here all ROBOT_VARIABLES settings
 #
 echo "# music robot variables settings";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://localhost -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
+ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
 
 echo ${ROBOT_VARIABLES}
 
diff --git a/test/csit/plans/music/music-test-plan/teardown.sh b/test/csit/plans/music/music-test-plan/teardown.sh
index 0806eb2..315be04 100755
--- a/test/csit/plans/music/music-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-test-plan/teardown.sh
@@ -24,13 +24,24 @@
 echo "# music scripts docker containers killing";
 echo "#";
 echo "##########################################################";
-kill-instance.sh music-tomcat
-kill-instance.sh music-war
-kill-instance.sh music-zk
-kill-instance.sh music-db
+docker stop music-tomcat 
+docker stop music-war 
+docker stop music-zk 
+docker stop music-db
+
+docker rm music-zk 
+docker rm music-tomcat 
+docker rm music-war 
+docker rm music-db
+
 docker volume rm music-vol
 
-rm -Rf /tmp/music
+echo "dump music.log files"
+ls -alF /tmp/music
+ls -alF /tmp/music/properties
+cat /tmp/music/logs/MUSIC/music.log
+
+#rm -Rf /tmp/music