diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1b35985..7f9d126 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,6 +47,10 @@ RUN mkdir -p /run/nginx
 RUN mkdir -p /var/log/nginx
 RUN sed -i 's/nobody/nginx/g' /etc/php7/php-fpm.d/www.conf
 
+# Since requests can trigger conversion, let's give the server enough time to respond
+RUN sed -i "/max_execution_time/c\max_execution_time=3600" /etc/php7/php.ini
+RUN sed -i "/max_input_time/c\max_input_time=3600" /etc/php7/php.ini
+
 WORKDIR /var/www/
 
 # Volumes to mount
diff --git a/docker/rootfs/nginx.conf b/docker/rootfs/nginx.conf
index a11c57c..871c0b8 100644
--- a/docker/rootfs/nginx.conf
+++ b/docker/rootfs/nginx.conf
@@ -33,6 +33,10 @@ server {
         fastcgi_index			index.php;
         fastcgi_buffers			8 16k;
         fastcgi_buffer_size		32k;
+        fastcgi_max_temp_file_size 0;   # caching files to disk while uploading. this will help low-memory devices
+        fastcgi_read_timeout 1d;        # we set the timeout to 1 day so big uploads and  have enough time to be delivered
+        fastcgi_send_timeout 1d;        # it's especially important if you want to use storage controllers like S3 or FTP
+        fastcgi_request_buffering off;  # disabbling buffering which will send the uploaded data right to PHP
 
         # fastcgi params
         fastcgi_param DOCUMENT_ROOT		$realpath_root;