diff --git a/plugins/aws/cloudfront/publicS3Origin.js b/plugins/aws/cloudfront/publicS3Origin.js
index 30efea69..0d6b659e 100644
--- a/plugins/aws/cloudfront/publicS3Origin.js
+++ b/plugins/aws/cloudfront/publicS3Origin.js
@@ -52,7 +52,7 @@ module.exports = {
             let publicOrigins = [];
             for (var o in distribution.Origins.Items) {
                 var origin = distribution.Origins.Items[o];
-                if (origin.DomainName && origin.DomainName.match(/s3(.*)\.amazonaws\.com/) &&
+                if (origin.DomainName && origin.DomainName.match(/^s3(?:[.-].*)?\.amazonaws\.com$/) &&
                     origin.S3OriginConfig &&
                     (!origin.S3OriginConfig.OriginAccessIdentity ||
                         !origin.S3OriginConfig.OriginAccessIdentity.length) && !origin.OriginAccessControlId) {