diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index 992d94c5a..0801516e0 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -38,3 +38,5 @@ 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
+kiwix_threads: 4
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;
+
 }
diff --git a/roles/kiwix/templates/kiwix-serve.service.j2 b/roles/kiwix/templates/kiwix-serve.service.j2
index 14dc96bc8..30157bbac 100644
--- a/roles/kiwix/templates/kiwix-serve.service.j2
+++ b/roles/kiwix/templates/kiwix-serve.service.j2
@@ -4,7 +4,7 @@ After=syslog.target network.target local-fs.target
 
 [Service]
 Type=forking
-ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }}
+ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }} --threads {{ kiwix_threads }}
 TimeoutStartSec=180
 Restart=on-abort
 RestartSec=5s