diff --git a/infrastructure/template.yaml b/infrastructure/template.yaml
index aec3e8ec2..807b64cd0 100644
--- a/infrastructure/template.yaml
+++ b/infrastructure/template.yaml
@@ -2751,7 +2751,7 @@ Resources:
     Type: AWS::Logs::MetricFilter
     Properties:
       LogGroupName: !Ref NinoIssueCredentialLogGroup
-      FilterPattern: '{($.details.name = "Create Signed JWT")}'
+      FilterPattern: '{($.details.name = "Create Signed JWT") && ($.type = "PassStateExited")}'
       MetricTransformations:
         - MetricValue: 1
           MetricName: VCIssuedMetric