diff --git a/primary-region-infra.yml b/primary-region-infra.yml
index 9c158f2..3909317 100644
--- a/primary-region-infra.yml
+++ b/primary-region-infra.yml
@@ -114,7 +114,8 @@ Resources:
         Enabled: 'true'
         HttpVersion: http2
         Origins:
-        - DomainName: !Sub "${PrimaryBucket}.s3-website-${AWS::Region}.amazonaws.com"
+          # Use the WebsiteURL /but/ use the part after '//'
+        - DomainName: !Select [ "1" , "Fn::Split": [ "//", "Fn::GetAtt": [ PrimaryBucket, WebsiteURL ] ] ]
           Id: PrimaryBucketOrigin
           CustomOriginConfig:
             OriginProtocolPolicy: "http-only"
diff --git a/standby-region-infra.yml b/standby-region-infra.yml
index ca6973d..538f253 100644
--- a/standby-region-infra.yml
+++ b/standby-region-infra.yml
@@ -68,7 +68,8 @@ Resources:
         Enabled: true
         HttpVersion: http2
         Origins:
-        - DomainName: !Sub "${StandbyReplicationBucket}.s3-website-${AWS::Region}.amazonaws.com"
+          # Use the WebsiteURL /but/ use the part after '//'
+        - DomainName: !Select [ "1" , "Fn::Split": [ "//", "Fn::GetAtt": [ StandbyReplicationBucket, WebsiteURL ] ] ]
           Id: StandbyBucketOrigin
           CustomOriginConfig:
             OriginProtocolPolicy: "http-only"