diff --git a/charmhelpers/contrib/openstack/templates/haproxy.cfg b/charmhelpers/contrib/openstack/templates/haproxy.cfg
index ebc8a68..d36af2a 100644
--- a/charmhelpers/contrib/openstack/templates/haproxy.cfg
+++ b/charmhelpers/contrib/openstack/templates/haproxy.cfg
@@ -17,22 +17,22 @@ defaults
 {%- if haproxy_queue_timeout %}
     timeout queue {{ haproxy_queue_timeout }}
 {%- else %}
-    timeout queue 5000
+    timeout queue 9000
 {%- endif %}
 {%- if haproxy_connect_timeout %}
     timeout connect {{ haproxy_connect_timeout }}
 {%- else %}
-    timeout connect 5000
+    timeout connect 9000
 {%- endif %}
 {%- if haproxy_client_timeout %}
     timeout client {{ haproxy_client_timeout }}
 {%- else %}
-    timeout client 30000
+    timeout client 90000
 {%- endif %}
 {%- if haproxy_server_timeout %}
     timeout server {{ haproxy_server_timeout }}
 {%- else %}
-    timeout server 30000
+    timeout server 90000
 {%- endif %}
 
 listen stats
diff --git a/config.yaml b/config.yaml
index 75afb4f..e0d327c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -203,25 +203,25 @@ options:
     default:
     description: |
       Server timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 30000ms is used.
+      configurations. If not provided, default value of 90000ms is used.
   haproxy-client-timeout:
     type: int
     default:
     description: |
       Client timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 30000ms is used.
+      configurations. If not provided, default value of 90000ms is used.
   haproxy-queue-timeout:
     type: int
     default:
     description: |
       Queue timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 5000ms is used.
+      configurations. If not provided, default value of 9000ms is used.
   haproxy-connect-timeout:
     type: int
     default:
     description: |
       Connect timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 5000ms is used.
+      configurations. If not provided, default value of 9000ms is used.
   gnocchi-archive-policy:
     type: string
     default: low