diff --git a/plugins/aws/s3/bucketPolicyCloudFrontOai.js b/plugins/aws/s3/bucketPolicyCloudFrontOai.js
index ed4d12ee..4b0732bd 100644
--- a/plugins/aws/s3/bucketPolicyCloudFrontOai.js
+++ b/plugins/aws/s3/bucketPolicyCloudFrontOai.js
@@ -55,7 +55,7 @@ module.exports = {
                 for (let origin of distribution.Origins.Items) {
                     if (origin.S3OriginConfig && origin.DomainName) {
                         s3OriginFound = true;
-                        let bucketName = origin.DomainName.replace(/.s3.*.com/, '');
+                        let bucketName = origin.DomainName.replace(/\.s3\..*\.com/, '');
                         if (bucketName &&
                             origin.S3OriginConfig.OriginAccessIdentity &&
                             origin.S3OriginConfig.OriginAccessIdentity.length) {