diff --git a/docker-compose/common.yml b/docker-compose/common.yml
index 14ec6db..28bff14 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/link-devices b/link-devices
index 38d8057..568eccb 100755
--- a/link-devices
+++ b/link-devices
@@ -42,7 +42,7 @@ do
   fi
 done
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
    'http://iot-agent:4041/iot/devices' \
    -H 'Content-Type: application/json' \
    -H 'fiware-service: openiot' \
@@ -74,7 +74,7 @@ do
   fi
 done
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
    'http://iot-agent:4041/iot/devices' \
    -H 'Content-Type: application/json' \
    -H 'fiware-service: openiot' \
diff --git a/provision-devices b/provision-devices
index 5abaa85..25acbe7 100755
--- a/provision-devices
+++ b/provision-devices
@@ -17,7 +17,7 @@ printf "⏳ Provisioning IoT devices "
 # Create a service groups for all JSON IoT devices
 #
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
   'http://iot-agent:4041/iot/services' \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
@@ -186,7 +186,7 @@ curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
 # Provision actuators for Farm 001
 #
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
   'http://iot-agent:4041/iot/devices' \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
@@ -242,7 +242,7 @@ curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
 # Provision actuators for Farm 002
 #
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
   'http://iot-agent:4041/iot/devices' \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
@@ -298,7 +298,7 @@ curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
 # Provision actuators for Farm 003
 #
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
   'http://iot-agent:4041/iot/devices' \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
@@ -354,7 +354,7 @@ curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
 # Provision actuators for Farm 004
 #
 
-curl -sSf -o /dev/null --retry 10 --retry-all-errors --retry-delay 10 -X POST \
+curl -sSf -o /dev/null -X POST \
   'http://iot-agent:4041/iot/devices' \
   -H 'Content-Type: application/json' \
   -H 'fiware-service: openiot' \
diff --git a/services b/services
index f2efc2b..d4152dc 100755
--- a/services
+++ b/services
@@ -162,9 +162,9 @@ 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