diff --git a/.ebextensions/02_extend-proxy-timeout.config b/.ebextensions/02_extend-proxy-timeout.config
new file mode 100644
index 000000000..c64e51052
--- /dev/null
+++ b/.ebextensions/02_extend-proxy-timeout.config
@@ -0,0 +1,10 @@
+container_commands:
+  extend_proxy_timeout:
+    command: |
+      sed -i '/\s*location \/ {/c \
+              location / { \
+                  proxy_connect_timeout       600;\
+                  proxy_send_timeout          600;\
+                  proxy_read_timeout          600;\
+                  send_timeout                600;\
+              ' /tmp/deployment/config/#etc#nginx#conf.d#00_elastic_beanstalk_proxy.conf