diff --git a/extensions/lifecycle/management.js b/extensions/lifecycle/management.js
index 0cb878f82..ad60d8528 100644
--- a/extensions/lifecycle/management.js
+++ b/extensions/lifecycle/management.js
@@ -3,6 +3,7 @@ const werelogs = require('werelogs');
 
 const config = require('../../lib/Config');
 const management = require('../../lib/management/index');
+const { TIMEOUT_MS } = require('../../lib/clients/utils');
 
 const logger = new werelogs.Logger('mdManagement:lifecycle');
 
@@ -18,7 +19,7 @@ function getS3Client(endpoint) {
         credentials,
         s3ForcePathStyle: true,
         signatureVersion: 'v4',
-        httpOptions: { timeout: 0 },
+        httpOptions: { timeout: TIMEOUT_MS },
         maxRetries: 3,
     });
     return s3Client;
diff --git a/lib/clients/utils.js b/lib/clients/utils.js
index f9022aefb..0ce3574cb 100644
--- a/lib/clients/utils.js
+++ b/lib/clients/utils.js
@@ -19,7 +19,7 @@ function createS3Client(params) {
         sslEnabled: transport === 'https',
         s3ForcePathStyle: true,
         signatureVersion: 'v4',
-        httpOptions: { agent, timeout: 0 },
+        httpOptions: { agent, timeout: TIMEOUT_MS },
         maxRetries: 0,
     });
 }