diff --git a/CHANGES b/CHANGES
index 504750c1d..dfb809c98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2131,4 +2131,5 @@
 * rsync: add warning to remove lifecycle rules
 * Add volume management
 * backups: adjust node's heap size based on memory limit
+* s3: each chunk can take up to 30 mins to upload
 
diff --git a/src/storage/s3.js b/src/storage/s3.js
index f4a18781c..d83b03d9c 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -67,8 +67,8 @@ function getS3Config(apiConfig, callback) {
             customBackoff: () => 20000 // constant backoff - https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/Config.html#retryDelayOptions-property
         },
         httpOptions: {
-            connectTimeout: 10000, // https://github.com/aws/aws-sdk-js/pull/1446
-            timeout: 600 * 1000 // https://github.com/aws/aws-sdk-js/issues/1704 (allow chunk upload to take upto 5 minutes)
+            connectTimeout: 20000, // https://github.com/aws/aws-sdk-js/pull/1446
+            timeout: 3000 * 1000 // https://github.com/aws/aws-sdk-js/issues/1704 (allow chunk upload to take upto 30 minutes)
         }
     };