diff --git a/packages/client/hmi-client/src/services/dataset.ts b/packages/client/hmi-client/src/services/dataset.ts
index 5030676b5f..edcfc13a70 100644
--- a/packages/client/hmi-client/src/services/dataset.ts
+++ b/packages/client/hmi-client/src/services/dataset.ts
@@ -184,7 +184,7 @@ async function createNewDatasetFromFile(
 				Math.round((progressEvent.loaded * 100) / (progressEvent?.total ?? 100))
 			);
 		},
-		timeout: 30000
+		timeout: 3600000
 	});
 
 	if (!urlResponse || urlResponse.status >= 400) {
diff --git a/packages/server/src/main/resources/application.properties b/packages/server/src/main/resources/application.properties
index a88294f02c..7b50ac2cef 100644
--- a/packages/server/src/main/resources/application.properties
+++ b/packages/server/src/main/resources/application.properties
@@ -92,9 +92,10 @@ server.port=3000
 server.http2.enabled=true
 spring.jackson.default-property-inclusion=NON_NULL
 spring.jackson.mapper.ACCEPT_CASE_INSENSITIVE_ENUMS=true
-# This value needs to be mirrored in default.conf in the nginx container
-spring.servlet.multipart.max-file-size=100MB
-spring.servlet.multipart.max-request-size=100MB
+
+spring.servlet.multipart.max-file-size=1GB
+spring.servlet.multipart.max-request-size=1GB
+
 logging.level.org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver=ERROR
 #swagger configuration
 terarium.enable-swagger=true