diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index 992d94c5a..f3aebfb36 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -38,3 +38,4 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
 # - NEW WAY: cd /opt/iiab/iiab; ./runrole --reinstall kiwix
 # - OLD WAY: rm /opt/iiab/kiwix/bin/kiwix-serve; cd /opt/iiab/iiab; ./runrole kiwix
 kiwix_force_install: False
+kiwix_nginx_timeout: 600
diff --git a/roles/kiwix/templates/kiwix-nginx.conf b/roles/kiwix/templates/kiwix-nginx.conf
index c14b82f1a..2c5f96f80 100644
--- a/roles/kiwix/templates/kiwix-nginx.conf
+++ b/roles/kiwix/templates/kiwix-nginx.conf
@@ -1,3 +1,12 @@
 location /kiwix {
+  proxy_set_header   X-Real-IP $remote_addr;
+  proxy_set_header   Host      $http_host;
+  proxy_http_version 1.1;
+  proxy_set_header Connection "";
+  proxy_connect_timeout {{ kiwix_nginx_timeout }};
+  proxy_send_timeout {{ kiwix_nginx_timeout }};
+  proxy_read_timeout {{ kiwix_nginx_timeout }};
+  send_timeout {{ kiwix_nginx_timeout }};
   proxy_pass http://127.0.0.1:3000;
+
 }