diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1a5d1438..a5f12e64 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,8 +24,8 @@ spring.devtools.livereload.enabled=true
 
 spring.thymeleaf.encoding=UTF-8
 
-server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m}
-spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000}
+server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:20m}
+spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 
 spring.resources.static-locations=file:customFiles/static/
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/