diff --git a/modules/log_ingestion.s3.cft.yaml b/modules/log_ingestion.s3.cft.yaml
index 7d50530..32d930a 100644
--- a/modules/log_ingestion.s3.cft.yaml
+++ b/modules/log_ingestion.s3.cft.yaml
@@ -114,8 +114,8 @@ Conditions:
   ]
 
   DeployRole: !And [
-    !Equals [ !Ref BucketAccountId, !Ref "AWS::AccountId" ] ,
-    !Equals [ DeployStackSet, "false" ]
+    !Equals [ !Ref BucketAccountId, !Ref "AWS::AccountId" ],
+    !Not [ !Condition DeployStackSet ]
   ]
 
   NeedKMSPolicy: !And [