diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 5a4e7e85..23c4fac6 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -36,6 +36,9 @@ http {
 
     keepalive_timeout 5;
 
+    proxy_connect_timeout 360s;
+    proxy_read_timeout 360s;
+
     # path for static files
     location /static {
       root /webodm/build;
diff --git a/start.sh b/start.sh
index 969f0673..64425455 100755
--- a/start.sh
+++ b/start.sh
@@ -83,7 +83,7 @@ else
        echo -e "\033[91mWARN:\033[39m /webodm/build/static does not exist, CSS, JS and other files might not be available."
     fi 
     nginx -c $(pwd)/nginx/nginx.conf
-    gunicorn webodm.wsgi --bind unix:/tmp/gunicorn.sock --preload
+    gunicorn webodm.wsgi --bind unix:/tmp/gunicorn.sock --timeout 360 --preload
 fi
 
 # If this is executed, it means the previous command failed, don't display the congratulations message