diff --git a/nginx.default b/nginx.default
index 95b3f59..4cbb735 100644
--- a/nginx.default
+++ b/nginx.default
@@ -16,5 +16,9 @@ server {
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         add_header 'Access-Control-Allow-Origin' '*';
+        # Set timeouts
+        proxy_connect_timeout 60s;     # Time to wait for a connection
+        proxy_send_timeout 60s;        # Time to wait for data to be sent to the proxied server
+        proxy_read_timeout 60s;        # Time to wait for data to be read from the proxied server
     }
 }
diff --git a/start-server.sh b/start-server.sh
index 32cbb10..6ec03d7 100755
--- a/start-server.sh
+++ b/start-server.sh
@@ -9,4 +9,4 @@ python manage.py collectstatic --no-input
 ./download_files.sh
 python manage.py find_duplicated_persons
 python manage.py find_duplicated_places
-gunicorn pmb.wsgi --user www-data --bind 0.0.0.0:8010 --workers 1 --timeout 600 & nginx -g "daemon off;"
\ No newline at end of file
+gunicorn pmb.wsgi --user www-data --bind 0.0.0.0:8010 --workers 3 --timeout 30 & nginx -g "daemon off;"
\ No newline at end of file