diff --git a/.github/workflows/after-approval.yml b/.github/workflows/after-approval.yml
index 284046b5076..6fc743641d0 100644
--- a/.github/workflows/after-approval.yml
+++ b/.github/workflows/after-approval.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   pre_job:
+    if: (github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'extended-tests'))
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
@@ -13,27 +14,15 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          concurrent_skipping: 'always'
+          concurrent_skipping: 'same_content_newer'
           skip_after_successful_duplicate: 'true'
           do_not_skip: '["pull_request", "merge_group"]'
-          paths-ignore: '["packages/lexical-website/**", "packages/*/README.md", ".size-limit.js"]'
+          paths_ignore: '["packages/lexical-website/**", "packages/*/README.md", ".size-limit.js"]'
   e2e-tests:
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true' && (github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'extended-tests'))
     uses: ./.github/workflows/call-e2e-all-tests.yml
 
-  flaky-test-notice:
-    needs: e2e-tests
-    runs-on: ubuntu-latest
-    if: always()
-    steps:
-      - name: Flaky test notice PR comment
-        if: needs.e2e-tests.result == 'failure' || needs.e2e-tests.result == 'cancelled'
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            E2E tests failed on [this run](https://github.com/facebook/lexical/actions/runs/${{ github.run_id }}). Please check if the failure is due to a flaky test. Visit the [Flaky Test Tracker](https://github.com/facebook/lexical/discussions/6289) for known flaky tests, and record the failed test run there if its a flaky failure.
-
   integration-tests:
     needs: pre_job
     if: needs.pre_job.outputs.should_skip != 'true' && (github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'extended-tests'))
diff --git a/.github/workflows/tests-extended.yml b/.github/workflows/tests-extended.yml
index b0d036bc6f9..fd1fad554ea 100644
--- a/.github/workflows/tests-extended.yml
+++ b/.github/workflows/tests-extended.yml
@@ -17,18 +17,6 @@ jobs:
     if: github.repository_owner == 'facebook' && contains(github.event.pull_request.labels.*.name, 'extended-tests')
     uses: ./.github/workflows/call-e2e-all-tests.yml
 
-  flaky-test-notice:
-    needs: e2e-tests
-    runs-on: ubuntu-latest
-    if: always()
-    steps:
-      - name: Flaky test notice PR comment
-        if: needs.e2e-tests.result == 'failure' || needs.e2e-tests.result == 'cancelled'
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            E2E tests failed on [this run](https://github.com/facebook/lexical/actions/runs/${{ github.run_id }}). Please check if the failure is due to a flaky test. Visit the [Flaky Test Tracker](https://github.com/facebook/lexical/discussions/6289) for known flaky tests, and record the failed test run there if its a flaky failure.
-
   integration-tests:
     if: github.repository_owner == 'facebook' && contains(github.event.pull_request.labels.*.name, 'extended-tests')
     uses: ./.github/workflows/call-integration-tests.yml