diff --git a/lib/config.js b/lib/config.js
index 31999b07b6..3ac46179f7 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -80,9 +80,12 @@ var imageUploadType = process.env.HMD_IMAGE_UPLOAD_TYPE || config.imageUploadTyp
 
 config.s3 = config.s3 || {}
 var s3 = {
+  endpoint: process.env.HMD_S3_ENDPOINT || config.s3.endpoint,
   accessKeyId: handleDockerSecret('s3_acccessKeyId') || process.env.HMD_S3_ACCESS_KEY_ID || config.s3.accessKeyId,
   secretAccessKey: handleDockerSecret('s3_secretAccessKey') || process.env.HMD_S3_SECRET_ACCESS_KEY || config.s3.secretAccessKey,
-  region: process.env.HMD_S3_REGION || config.s3.region
+  region: process.env.HMD_S3_REGION || config.s3.region,
+  s3ForcePathStyle: 'true',
+  signatureVersion: 'v4'
 }
 var s3bucket = process.env.HMD_S3_BUCKET || config.s3.bucket