diff --git a/roles/heat/tasks/main.yml b/roles/heat/tasks/main.yml
index 32688fb..11adf1e 100644
--- a/roles/heat/tasks/main.yml
+++ b/roles/heat/tasks/main.yml
@@ -51,7 +51,7 @@
     openstack_helm_ingress_endpoint: orchestration
     openstack_helm_ingress_service_name: heat-api
     openstack_helm_ingress_service_port: 8004
-    openstack_helm_ingress_annotations: "{{ heat_ingress_annotations }}"
+    openstack_helm_ingress_annotations: "{{ _heat_ingress_annotations | combine(heat_ingress_annotations, recursive=True) }}"
 
 - name: Create Ingress
   ansible.builtin.include_role:
@@ -60,4 +60,4 @@
     openstack_helm_ingress_endpoint: cloudformation
     openstack_helm_ingress_service_name: heat-cfn
     openstack_helm_ingress_service_port: 8000
-    openstack_helm_ingress_annotations: "{{ heat_ingress_annotations }}"
+    openstack_helm_ingress_annotations: "{{ _heat_ingress_annotations | combine(heat_ingress_annotations, recursive=True) }}"
diff --git a/roles/heat/vars/main.yml b/roles/heat/vars/main.yml
index 0374cf7..3104161 100644
--- a/roles/heat/vars/main.yml
+++ b/roles/heat/vars/main.yml
@@ -31,6 +31,7 @@
         log_config_append: null
         num_engine_workers: 8
         region_name_for_services: "{{ openstack_helm_endpoints['identity']['auth']['heat']['region_name'] }}"
+        rpc_response_timeout: 600
         server_keystone_endpoint_type: public
       clients_keystone:
         endpoint_type: publicURL
@@ -49,3 +50,6 @@
     ingress_cfn: false
     service_ingress_api: false
     service_ingress_cfn: false
+
+_heat_ingress_annotations:
+  nginx.ingress.kubernetes.io/proxy-read-timeout: "630"