diff --git a/docker-compose/common.yml b/docker-compose/common.yml
index e5ddd02..b6d859f 100644
--- a/docker-compose/common.yml
+++ b/docker-compose/common.yml
@@ -106,7 +106,7 @@ services:
       - IOTA_CB_NGSI_VERSION=ld # use NGSI-LD when sending updates for active attributes
       - IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld
       - IOTA_FALLBACK_TENANT=openiot
-      - IOTA_MULTI_CORE=true
+      - IOTA_MULTI_CORE=false
       - IOTA_AMQP_DISABLED=true
       - IOTA_MQTT_DISABLED=true
     healthcheck:
diff --git a/services b/services
index 2781e53..6e59714 100755
--- a/services
+++ b/services
@@ -154,20 +154,18 @@ stoppingContainers () {
 	CONTAINERS=$(docker ps --filter "label=org.fiware=tutorial" -aq)
 	if [[ -n "$CONTAINERS" ]]; then 
 		echo "Stopping containers"
-		docker rm -f $CONTAINERS || true
+		docker rm -f -v $CONTAINERS || true
 	fi
-	VOLUMES=$(docker volume ls -qf dangling=true) 
+	VOLUMES=$(docker volume ls -q --filter dangling=true --filter "label=com.docker.compose.project=fiware")
 	if [[ -n "$VOLUMES" ]]; then 
 		echo "Removing old volumes"
 		docker volume rm $VOLUMES || true
 	fi
-
 	NETWORKS=$(docker network ls  --filter "label=org.fiware=tutorial" -q) 
 	if [[ -n "$NETWORKS" ]]; then 
 		echo "Removing tutorial networks"
 		docker network rm $NETWORKS || true
 	fi
-
 }
 
 addIoTDatabaseIndex () {