diff --git a/entity-types/infra-awssqsqueue/definition.yml b/entity-types/infra-awssqsqueue/definition.yml
index bd8e05609..388dfd6c5 100644
--- a/entity-types/infra-awssqsqueue/definition.yml
+++ b/entity-types/infra-awssqsqueue/definition.yml
@@ -16,8 +16,10 @@ synthesis:
       name: aws.sqs.QueueName
       encodeIdentifierInGUID: false
       conditions:
-        - attribute: eventType
-          prefix: Log
+        - attribute: eventSource
+          value: sqs.amazonaws.com
+        - attribute: eventName
+          present: true
         - attribute: aws.Arn
           present: true
         - attribute: aws.sqs.QueueName
@@ -40,8 +42,10 @@ synthesis:
       name: aws.sqs.QueueName
       encodeIdentifierInGUID: true
       conditions:
-        - attribute: eventType
-          prefix: Log
+        - attribute: eventSource
+          value: sqs.amazonaws.com
+        - attribute: eventName
+          present: true
         - attribute: aws.Arn
           present: true
         - attribute: aws.sqs.QueueName