diff --git a/docker/nginx_production/conf.d/default.conf b/docker/nginx_production/conf.d/default.conf
index 69a08528b..7a7929de2 100644
--- a/docker/nginx_production/conf.d/default.conf
+++ b/docker/nginx_production/conf.d/default.conf
@@ -98,6 +98,9 @@ server {
     include uwsgi_params;
     uwsgi_buffering off;
     uwsgi_request_buffering off;
+    uwsgi_read_timeout 900s;
+    uwsgi_send_timeout 900s;
+    uwsgi_connect_timeout 900s;
 
     # Max upload size for files is set to 50GB (configure as needed).
     client_max_body_size 500G;
diff --git a/docker/uwsgi/uwsgi_rest.ini b/docker/uwsgi/uwsgi_rest.ini
index aa58dcc24..74dc6835a 100644
--- a/docker/uwsgi/uwsgi_rest.ini
+++ b/docker/uwsgi/uwsgi_rest.ini
@@ -10,5 +10,11 @@ mount = /api=invenio_app.wsgi_rest:application
 manage-script-name = true
 wsgi-disable-file-wrapper = true
 single-interpreter = true
-buffer-size = 32768
+buffer-size = 65535
 pidfile = /tmp/uwsgi_rest.pid
+socket-timeout = 900
+so-write-timeout = 900
+socket-write-timeout = 900
+so-send-timeout = 900
+socket-send-timeout = 900
+harakiri = 900
\ No newline at end of file