diff --git a/.github/workflows/test_apply.yml b/.github/workflows/test_apply.yml
index 542fd7ed4232..a42ccd214707 100644
--- a/.github/workflows/test_apply.yml
+++ b/.github/workflows/test_apply.yml
@@ -92,9 +92,9 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         if: ${{ always() }}
         with:
-          issue-number: ${{ needs.e2e_apply_test.outputs.issue_number }}
+          issue-number: ${{ github.event.number }}
           comment-author: 'github-actions[bot]'
           repository: ${{ github.repository }}
           body: |
-            AUTO COMMIT: ${{ github.workflow }}: ${{ needs.e2e_apply_test.conclusion == 'failure' && 'Failure' || 'Success' }} [Action link](${{ needs.e2e_apply_test.outputs.action_link }})
+            AUTO COMMIT: ${{ github.workflow }}: ${{ needs.e2e_apply_test.conclusion == 'failure' && 'Failure' || 'Success' }} [Action link](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
           token: "${{ secrets.GH_PAT }}"