diff --git a/ansible/roles/haproxy/defaults/main.yml b/ansible/roles/haproxy/defaults/main.yml
index 77e91b2c97..88b3adbd55 100644
--- a/ansible/roles/haproxy/defaults/main.yml
+++ b/ansible/roles/haproxy/defaults/main.yml
@@ -45,6 +45,9 @@ haproxy_defaults_balance: "roundrobin"
 haproxy_glance_api_client_timeout: "6h"
 haproxy_glance_api_server_timeout: "6h"
 
+haproxy_outward_rabbitmq_client_timeout: "1h"
+haproxy_outward_rabbitmq_server_timeout: "1h"
+
 syslog_server: "{{ api_interface_address }}"
 syslog_haproxy_facility: "local1"
 
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 28084691ff..cd8578c4d0 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -67,8 +67,8 @@ listen outward_rabbitmq_management
 listen outward_rabbitmq_external
   mode tcp
   option tcplog
-  timeout client 3600s
-  timeout server 3600s
+  timeout client {{ haproxy_outward_rabbitmq_client_timeout }}
+  timeout server {{ haproxy_outward_rabbitmq_server_timeout }}
   bind {{ kolla_external_vip_address }}:{{ outward_rabbitmq_port }}
 {% for tcp_option in haproxy_listen_tcp_extra %}
   {{ tcp_option }}
diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml
index de66a826af..ed1f2d14bf 100644
--- a/ansible/roles/murano/defaults/main.yml
+++ b/ansible/roles/murano/defaults/main.yml
@@ -58,6 +58,7 @@ murano_logging_debug: "{{ openstack_logging_debug }}"
 
 openstack_murano_auth: "{{ openstack_auth }}"
 
+murano_agent_timeout: 3600
 
 ####################
 # Kolla
diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2
index 3c9641f4ef..ed33c7a5db 100644
--- a/ansible/roles/murano/templates/murano.conf.j2
+++ b/ansible/roles/murano/templates/murano.conf.j2
@@ -12,6 +12,7 @@ transport_url = {{ rpc_transport_url }}
 
 [engine]
 engine_workers = {{ openstack_service_workers }}
+agent_timeout = {{ murano_agent_timeout }}
 
 [database]
 connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }}