diff --git a/ansible/roles/gateway/files/haproxy.cfg b/ansible/roles/gateway/files/haproxy.cfg
index 95c8bca..7d12832 100644
--- a/ansible/roles/gateway/files/haproxy.cfg
+++ b/ansible/roles/gateway/files/haproxy.cfg
@@ -14,9 +14,10 @@ defaults
   mode	http
   option	httplog
   option	dontlognull
-  timeout connect 10000
-  timeout client  50000
-  timeout server  50000
+  timeout http-request 60s
+  timeout connect 10s
+  timeout client  10s
+  timeout server  10s
   errorfile 400 /etc/haproxy/errors/400.http
   errorfile 403 /etc/haproxy/errors/403.http
   errorfile 408 /etc/haproxy/errors/408.http