diff --git a/etc/rpc_deploy/user_variables.yml b/etc/rpc_deploy/user_variables.yml
index 71679740ae..94e0b57322 100644
--- a/etc/rpc_deploy/user_variables.yml
+++ b/etc/rpc_deploy/user_variables.yml
@@ -165,3 +165,8 @@ swift_allow_all_users: False
 # The dispersion user is for swift-dispersion-report
 swift_dispersion_user: dispersion
 swift_dispersion_password:
+
+# This variables is used to set haproxy's timeout client and timeout server
+# values, they are set in the main config file and are only used by services
+# that don't set their own values (default: 90)
+#haproxy_timeout: 90
diff --git a/rpc_deployment/roles/haproxy_common/templates/haproxy.cfg b/rpc_deployment/roles/haproxy_common/templates/haproxy.cfg
index 6ebd1aae59..dc6049c829 100644
--- a/rpc_deployment/roles/haproxy_common/templates/haproxy.cfg
+++ b/rpc_deployment/roles/haproxy_common/templates/haproxy.cfg
@@ -14,9 +14,9 @@ defaults
         option dontlognull
         option redispatch
         retries 3
-        timeout client 50s
+        timeout client {{ haproxy_timeout|default(90) }}
         timeout connect 10s
-        timeout server 50s
+        timeout server {{ haproxy_timeout|default(90) }}
         maxconn 4096
         errorfile 400 /etc/haproxy/errors/400.http
         errorfile 403 /etc/haproxy/errors/403.http