diff --git a/.github/workflows/daily-image-tests.yml b/.github/workflows/daily-image-tests.yml
index f48aa7f9c7..c7ef237bdc 100644
--- a/.github/workflows/daily-image-tests.yml
+++ b/.github/workflows/daily-image-tests.yml
@@ -37,7 +37,7 @@ jobs:
     name: GitHub Issue
     runs-on: ubuntu-latest
     needs: check-broken-images
-    if: ${{ inputs.create_issue == true && failure() }}
+    if: ${{ inputs.create_issue == true && needs.check-broken-images.outputs.testPassed == 'False'}}
     steps:
       - name: Playwright Artifact
         run: |
diff --git a/.github/workflows/template-ui-tests.yml b/.github/workflows/template-ui-tests.yml
index 3a58dbaa0e..6e5d8b69e2 100644
--- a/.github/workflows/template-ui-tests.yml
+++ b/.github/workflows/template-ui-tests.yml
@@ -13,12 +13,16 @@ on:
       artifact-id:
         description: "Playwright Artifact ID"
         value: ${{ jobs.test.outputs.artifact-id }}
+      testPassed:
+        description: "Test Passed"
+        value: ${{ jobs.test.outputs.testPassed }}
 
 jobs:
   test:
     name: Run Playwright tests
     runs-on: ubuntu-latest
     outputs:
+      testPassed: ${{ steps.run.outputs.testPassed || 'True' }}
       artifact-id: ${{ steps.artifact-report.outputs.artifact-id }}
 
     steps:
@@ -57,7 +61,7 @@ jobs:
         id: failure
         if: failure() && steps.run.outcome == 'failure'
         run: |
-          echo " This is output of preivous job ${{ steps.run.outcome }}"
+          echo " This is output of preivous job: ${{ steps.run.outcome }}"
           echo "testPassed='False'" >> $env:GITHUB_OUTPUT
 
       - uses: actions/upload-artifact@v4