diff --git a/gunicorn.conf.py b/gunicorn.conf.py
index 2ac2d15b5d305e06b9bb726ddd52d42721985ceb..16484fd52069292cf24727fbf8e393ac8583608e 100644
--- a/gunicorn.conf.py
+++ b/gunicorn.conf.py
@@ -3,3 +3,5 @@ accesslog = "-"
 workers = 1
 max_requests = 1000
 max_requests_jitter = 10
+timeout = 60
+graceful_timeout = 60
diff --git a/nginx.conf b/nginx.conf
index ee2e07633fbd58bd46e3d63dad169c50092dac26..8d1a9d669edc7e66e872efd56863f105c3ae2d76 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -9,6 +9,11 @@ server {
 
     client_max_body_size 10M;
 
+    proxy_connect_timeout   60;
+    proxy_send_timeout      60;
+    proxy_read_timeout      60;
+    send_timeout            60;
+
     location /media/ {
         alias /var/opt/majak/media_files/;
     }