diff --git a/templates/cloudfront-site.yaml b/templates/cloudfront-site.yaml
index 5926009..3ea3c9a 100644
--- a/templates/cloudfront-site.yaml
+++ b/templates/cloudfront-site.yaml
@@ -105,7 +105,9 @@ Resources:
       OriginAccessControlConfig:
         # Get a unique ID for the OAC Config name.
         # Name must be unique within account
-        Name: !Select [2, !Split ['/', !Ref 'AWS::StackId']]
+        Name: !Sub
+          - amzn-secure-static-site-${guid}
+          - guid: !Select [2, !Split ['/', !Ref 'AWS::StackId']]
         OriginAccessControlOriginType: s3
         SigningBehavior: always
         SigningProtocol: sigv4