diff --git a/ansible/roles/haproxy/defaults/main.yml b/ansible/roles/haproxy/defaults/main.yml
index afce84ed2d..efbba58d20 100644
--- a/ansible/roles/haproxy/defaults/main.yml
+++ b/ansible/roles/haproxy/defaults/main.yml
@@ -15,3 +15,6 @@ haproxy_image_full: "{{ haproxy_image }}:{{ haproxy_tag }}"
 
 haproxy_client_timeout: "1m"
 haproxy_server_timeout: "1m"
+
+haproxy_glance_api_client_timeout: "6h"
+haproxy_glance_api_server_timeout: "6h"
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 680a2220a2..fd26cb9ad8 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -89,6 +89,8 @@ listen glance_registry
 
 listen glance_api
   bind {{ kolla_internal_vip_address }}:{{ glance_api_port }}
+  timeout client {{ haproxy_glance_api_client_timeout }}
+  timeout server {{ haproxy_glance_api_server_timeout }}
 {% for host in groups['glance-api'] %}
   server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5
 {% endfor %}