diff --git a/roles/matrix-corporal/defaults/main.yml b/roles/matrix-corporal/defaults/main.yml
index 9b0c9188..9430f053 100644
--- a/roles/matrix-corporal/defaults/main.yml
+++ b/roles/matrix-corporal/defaults/main.yml
@@ -19,7 +19,7 @@ matrix_corporal_container_extra_arguments: []
 # List of systemd services that matrix-corporal.service depends on
 matrix_corporal_systemd_required_services_list: ['docker.service']
 
-matrix_corporal_docker_image: "devture/matrix-corporal:1.7.2"
+matrix_corporal_docker_image: "devture/matrix-corporal:1.8.0"
 matrix_corporal_docker_image_force_pull: "{{ matrix_corporal_docker_image.endswith(':latest') }}"
 
 matrix_corporal_base_path: "{{ matrix_base_data_path }}/corporal"
@@ -46,8 +46,11 @@ matrix_corporal_matrix_timeout_milliseconds: 45000
 matrix_corporal_reconciliation_retry_interval_milliseconds: 30000
 matrix_corporal_reconciliation_user_id_local_part: "matrix-corporal"
 
+matrix_corporal_http_gateway_timeout_milliseconds: 60000
+
 matrix_corporal_http_api_enabled: false
 matrix_corporal_http_api_auth_token: ""
+matrix_corporal_http_api_timeout_milliseconds: 15000
 
 # Matrix Corporal policy provider configuration (goes directly into the configuration's `PolicyProvider` value)
 matrix_corporal_policy_provider_config: ""
diff --git a/roles/matrix-corporal/templates/config.json.j2 b/roles/matrix-corporal/templates/config.json.j2
index 378b2c19..dff73830 100644
--- a/roles/matrix-corporal/templates/config.json.j2
+++ b/roles/matrix-corporal/templates/config.json.j2
@@ -13,13 +13,15 @@
 	},
 
 	"HttpGateway": {
-		"ListenAddress": "0.0.0.0:41080"
+		"ListenAddress": "0.0.0.0:41080",
+		"TimeoutMilliseconds": {{ matrix_corporal_http_gateway_timeout_milliseconds }}
 	},
 
 	"HttpApi": {
 		"Enabled": {{ matrix_corporal_http_api_enabled|to_json }},
 		"ListenAddress": "0.0.0.0:41081",
-		"AuthorizationBearerToken": "{{ matrix_corporal_http_api_auth_token }}"
+		"AuthorizationBearerToken": "{{ matrix_corporal_http_api_auth_token }}",
+		"TimeoutMilliseconds": {{ matrix_corporal_http_api_timeout_milliseconds }}
 	},
 
 	"PolicyProvider": {{ matrix_corporal_policy_provider_config }},