diff --git a/blog-assets/automate-ami-builds-aws-codepipeline-D35708869/linux-ami-codepipeline.yaml b/blog-assets/automate-ami-builds-aws-codepipeline-D35708869/linux-ami-codepipeline.yaml
index 0acbc4f..79d8af6 100644
--- a/blog-assets/automate-ami-builds-aws-codepipeline-D35708869/linux-ami-codepipeline.yaml
+++ b/blog-assets/automate-ami-builds-aws-codepipeline-D35708869/linux-ami-codepipeline.yaml
@@ -63,6 +63,8 @@ Resources:
                         - Fn::Split:
                             - /
                             - Ref: AWS::StackId
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
diff --git a/patterns/LambdaZips/example.yaml b/patterns/LambdaZips/example.yaml
index 7a2a178..9071093 100644
--- a/patterns/LambdaZips/example.yaml
+++ b/patterns/LambdaZips/example.yaml
@@ -13,6 +13,8 @@ Resources:
   LambdaZipsBucket:
     Type: AWS::S3::Bucket
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
diff --git a/patterns/blog/CircularDependency/LessSimpleNonWorking.yaml b/patterns/blog/CircularDependency/LessSimpleNonWorking.yaml
index e0dcc62..91f4ea3 100644
--- a/patterns/blog/CircularDependency/LessSimpleNonWorking.yaml
+++ b/patterns/blog/CircularDependency/LessSimpleNonWorking.yaml
@@ -4,6 +4,8 @@ Resources:
   Bucket:
     Type: AWS::S3::Bucket
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
diff --git a/patterns/blog/CircularDependency/LessSimpleWorking.yaml b/patterns/blog/CircularDependency/LessSimpleWorking.yaml
index b3a041f..a971ace 100644
--- a/patterns/blog/CircularDependency/LessSimpleWorking.yaml
+++ b/patterns/blog/CircularDependency/LessSimpleWorking.yaml
@@ -4,6 +4,8 @@ Resources:
   Bucket:
     Type: AWS::S3::Bucket
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketName: !Sub "cderror-${AWS::AccountId}"
       BucketEncryption:
         ServerSideEncryptionConfiguration:
diff --git a/samples/cloudformation-codebuild-container/codebuild.yaml b/samples/cloudformation-codebuild-container/codebuild.yaml
index b5aca24..7a7a966 100755
--- a/samples/cloudformation-codebuild-container/codebuild.yaml
+++ b/samples/cloudformation-codebuild-container/codebuild.yaml
@@ -120,6 +120,8 @@ Resources:
   LambdaZipsBucket:
     Type: AWS::S3::Bucket
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
diff --git a/samples/cloudformation-cross-account/examples/bucket.yaml b/samples/cloudformation-cross-account/examples/bucket.yaml
index 52c0104..905c651 100644
--- a/samples/cloudformation-cross-account/examples/bucket.yaml
+++ b/samples/cloudformation-cross-account/examples/bucket.yaml
@@ -18,6 +18,8 @@ Resources:
       Tags:
       - Key: cross-account
         Value: !Ref Tag
+      VersioningConfiguration:
+        Status: Enabled
 Outputs:
   AccountId:
     Value: !Ref AWS::AccountId
diff --git a/samples/hugo-pipeline/templates/master.template.yaml b/samples/hugo-pipeline/templates/master.template.yaml
index c9a5f61..b395c1e 100644
--- a/samples/hugo-pipeline/templates/master.template.yaml
+++ b/samples/hugo-pipeline/templates/master.template.yaml
@@ -25,6 +25,8 @@ Resources:
   WebHostingBucket:
     Type: 'AWS::S3::Bucket'
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
diff --git a/templates/workload-yaml.template.yaml b/templates/workload-yaml.template.yaml
index b80272e..2575ffb 100644
--- a/templates/workload-yaml.template.yaml
+++ b/templates/workload-yaml.template.yaml
@@ -482,6 +482,8 @@ Resources:
   S3Bucket:
     Type: AWS::S3::Bucket
     Properties:
+      VersioningConfiguration:
+        Status: Enabled
       BucketEncryption:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault: