diff --git a/terraform/shared/shared.tf.json.template.py b/terraform/shared/shared.tf.json.template.py
index aab73e476f..ffae5ee557 100644
--- a/terraform/shared/shared.tf.json.template.py
+++ b/terraform/shared/shared.tf.json.template.py
@@ -83,6 +83,13 @@ def conformance_pack(name: str) -> str:
                                     '$.userIdentity.invokedBy != "config.amazonaws.com"',
                                     '$.userIdentity.invokedBy != "resource-explorer-2.amazonaws.com"'
                                 )
+                            ),
+                            _or(
+                                '$.eventSource != "s3.amazonaws.com"',
+                                '$.userIdentity.accountId NOT EXISTS',
+                                '$.userIdentity.accountId != "anonymous"',
+                                '$.requestParameters.bucketName NOT EXISTS',
+                                f'$.requestParameters.bucketName != "{aws.qualified_bucket_name('*')}"'
                             )
                         )
                     )),