diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index 69eeab93..ac2f7bcd 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -20,7 +20,10 @@ metadata:
     cert-manager.io/issuer: letsencrypt-sckan-composer
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/auth-keepalive-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-body-size: 512m
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
   name: sckan-composer-web-nginx-ingress
 spec:
   rules:
diff --git a/nginx/default.conf b/nginx/default.conf
index 39672e74..262027e5 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -9,13 +9,23 @@ server {
         root   /usr/share/nginx/html/;
         # index  index.html index.htm;
         try_files $uri /index.html;
+        proxy_connect_timeout   9000;
+        proxy_send_timeout      9000;
+        proxy_read_timeout      9000;
+        send_timeout            9000;
+        fastcgi_read_timeout    9000;
     }
-    
+
     location ~* ^/(admin|api|logged-out|login|composer|complete|disconnect|__debug__)/.*$ {
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto https;
         proxy_redirect off;
+        proxy_connect_timeout   9000;
+        proxy_send_timeout      9000;
+        proxy_read_timeout      9000;
+        send_timeout            9000;
+        fastcgi_read_timeout    9000;
         proxy_pass http://composer;
     }