diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ce8e164c182a5533f1140d15cb74d3178ba487ba..406c3c670c9f4c7b87ace3961e41337b321a8beb 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -78,8 +78,7 @@ services:
       #- DJANGO_SECRET_KEY=""
       #- ROSETTA_TASKS_PROXY_HOST=
       #- ROSETTA_TASKS_TUNNEL_HOST=
-      - ROSETTA_HOST=localhost
-      
+      - ROSETTA_HOST=localhost 
     ports:
       - "8080:8080"
       - "7000-7020:7000-7020"
diff --git a/rosetta/build b/rosetta/build
index 4d4b0e1378e202c3f438b51bdcb9c7a9cebd2c2d..5a40aa42fe19c4b7bdc997bd3b40d0ac3f924bb9 100755
--- a/rosetta/build
+++ b/rosetta/build
@@ -29,20 +29,25 @@ fi
 if [[ "x$SERVICE" == "x" ]] ; then
     
     # Build all services
-    $BUILD_COMMAND services/base -t rosetta/base
-    $BUILD_COMMAND services/slurmbase -t rosetta/slurmbase
-    $BUILD_COMMAND services/slurmcluster -t rosetta/slurmcluster    
-    $BUILD_COMMAND services/slurmclustermaster -t rosetta/slurmclustermaster    
-    $BUILD_COMMAND services/slurmclusterworker -t rosetta/slurmclusterworker    
-    $BUILD_COMMAND services/standaloneworker -t rosetta/standaloneworker    
-    $BUILD_COMMAND services/dregistry -t rosetta/dregistry
-    $BUILD_COMMAND services/webapp -t rosetta/webapp
-    $BUILD_COMMAND services/postgres -t rosetta/postgres
-    $BUILD_COMMAND services/proxy -t rosetta/proxy
+    NOCACHE=$NOCACHE rosetta/build base
+    NOCACHE=$NOCACHE rosetta/build slurmbase
+    NOCACHE=$NOCACHE rosetta/build slurmcluster    
+    NOCACHE=$NOCACHE rosetta/build slurmclustermaster    
+    NOCACHE=$NOCACHE rosetta/build slurmclusterworker    
+    NOCACHE=$NOCACHE rosetta/build standaloneworker     
+    NOCACHE=$NOCACHE rosetta/build dregistry
+    NOCACHE=$NOCACHE rosetta/build webapp
+    NOCACHE=$NOCACHE rosetta/build postgres
+    NOCACHE=$NOCACHE rosetta/build proxy
     
 else
 
     # Build a specific image
+    echo ""
+    echo "================================="
+    echo " Building $SERVICE..."
+    echo "================================="
+    echo ""
     $BUILD_COMMAND services/$SERVICE -t rosetta/$SERVICE
 
 fi
diff --git a/rosetta/rerun b/rosetta/rerun
index d0213a9b77b2898e7a97dd950795723228038286..ad51c9113221b699769c1c433f317628b548d285 100755
--- a/rosetta/rerun
+++ b/rosetta/rerun
@@ -10,11 +10,6 @@ if [[ $# -eq 0 ]] ; then
     docker-compose down
     docker-compose up -d
 else
-    UPDATE_OUT=$(docker-compose up -d --no-deps $@ 2>&1)
-    if [[ $UPDATE_OUT == *"is up-to-date"* ]]; then
-        echo "Image is up to date, only restarting the service..."
-        docker-compose restart $@
-    else
-        echo "Updated image and restarted the the service."
-    fi
+    rosetta/clean $@
+    rosetta/run $@
 fi