diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 7378dcaf3ad34c6e655ca2baea390d189b448467..ce8e164c182a5533f1140d15cb74d3178ba487ba 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -5,6 +5,7 @@ services:
     image: "rosetta/slurmclustermaster"
     container_name: slurmclustermaster
     hostname: slurmclustermaster
+    restart: unless-stopped
     environment:
       - SAFEMODE=False
     privileged: true
@@ -15,6 +16,7 @@ services:
     image: "rosetta/slurmclusterworker"
     container_name: slurmclusterworker
     hostname: slurmclusterworker
+    restart: unless-stopped
     environment:
       - SAFEMODE=False
     privileged: true
@@ -27,6 +29,7 @@ services:
     container_name: standaloneworker
     hostname: standaloneworker
     privileged: true
+    restart: unless-stopped
     volumes:
       - ./data/shared:/shared
       - /var/run/docker.sock:/var/run/docker.sock
@@ -35,6 +38,7 @@ services:
     container_name: dregistry
     hostname: dregistry
     image: "rosetta/dregistry"
+    restart: unless-stopped
     volumes:
       - ./data/dregistry:/var/lib/registry
 
@@ -42,6 +46,7 @@ services:
     image: "rosetta/postgres"
     container_name: postgres
     hostname: postgres
+    restart: unless-stopped
     environment:
       - SAFEMODE=False
     volumes:
@@ -51,6 +56,7 @@ services:
     image: "rosetta/webapp"
     container_name: webapp
     hostname: webapp
+    restart: unless-stopped
     environment:
       - SAFEMODE=False
       - DJANGO_DB_ENGINE="django.db.backends.postgresql_psycopg2"
diff --git a/services/webapp/run_webapp.sh b/services/webapp/run_webapp.sh
index e1b71143ed7f24a48b035e025523e1786209980f..622b6f46d91f14097ddd0061bc4eeffb12dc6f25 100644
--- a/services/webapp/run_webapp.sh
+++ b/services/webapp/run_webapp.sh
@@ -54,7 +54,9 @@ else
 	uwsgi --chdir=/opt/code \
 	      --module=rosetta.wsgi \
 	      --env DJANGO_SETTINGS_MODULE=rosetta.settings \
-	      --master --pidfile=/tmp/project-master.pid \
+	      --master --pidfile=/tmp/rosetta-master.pid \
+	      --workers 4 \
+	      --threads 4 \
 	      --socket=127.0.0.1:49152 \
 	      --static-map /static=/rosetta/static \
 	      --http :8080 \