diff --git a/packages/serverless-components/aws-cloudfront/lib/getBucketNameFromUrl.js b/packages/serverless-components/aws-cloudfront/lib/getBucketNameFromUrl.js
new file mode 100644
index 0000000000..8469a4ad8e
--- /dev/null
+++ b/packages/serverless-components/aws-cloudfront/lib/getBucketNameFromUrl.js
@@ -0,0 +1,4 @@
+module.exports = (hostname) => {
+  const domains = hostname.split(".");
+  return domains.slice(0, domains.indexOf("s3")).join(".");
+};
diff --git a/packages/serverless-components/aws-cloudfront/lib/getOriginConfig.js b/packages/serverless-components/aws-cloudfront/lib/getOriginConfig.js
index ed35bcec6f..fe99ae9fd6 100644
--- a/packages/serverless-components/aws-cloudfront/lib/getOriginConfig.js
+++ b/packages/serverless-components/aws-cloudfront/lib/getOriginConfig.js
@@ -1,3 +1,4 @@
+const getBucketNameFromUrl = require("./getBucketNameFromUrl");
 const url = require("url");
 
 module.exports = (origin, { originAccessIdentityId = "" }) => {
@@ -16,7 +17,7 @@ module.exports = (origin, { originAccessIdentityId = "" }) => {
   };
 
   if (originUrl.includes("s3")) {
-    const bucketName = hostname.split(".")[0];
+    const bucketName = getBucketNameFromUrl(hostname);
     originConfig.Id = bucketName;
     originConfig.DomainName = hostname;
     originConfig.S3OriginConfig = {