diff --git a/.github/actions/run-and-record-tests/action.yml b/.github/actions/run-and-record-tests/action.yml
index 469049b6a..333b6b99f 100644
--- a/.github/actions/run-and-record-tests/action.yml
+++ b/.github/actions/run-and-record-tests/action.yml
@@ -192,7 +192,7 @@ runs:
       if: ${{ always() }}
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
-        name: ${{ inputs.inference-mode }}-logs-${{ github.run_id }}-${{ github.run_attempt || '' }}-${{ inputs.provider }}
+        name: ${{ inputs.inference-mode }}-logs-${{ github.run_id }}-${{ github.run_attempt || '' }}-${{ inputs.provider }}-${{ inputs.run-vision-tests }}-${{ inputs.stack-config }}
         path: |
           *.log
         retention-days: 1
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index e64d71f98..12e3af862 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -38,27 +38,23 @@ on:
 
 concurrency:
   # This creates three concurrency groups:
-  #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for valid triggers with re-record-tests label)
-  #   ${{ github.workflow }}-${{ github.ref }}-replay (for valid triggers without re-record-tests label)
-  #   ${{ github.workflow }}-${{ github.ref }}-no-run (for invalid triggers that will be skipped)
+  #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for labeled events with re-record-tests label)
+  #   ${{ github.workflow }}-${{ github.ref }}-replay (for all non-labeled events)
+  #   ${{ github.workflow }}-${{ github.ref }}-no-run (for labeled events without re-record-tests label)
   # The "no-run" group ensures that irrelevant label events don't interfere with the real workflows.
   group: >-
     ${{ github.workflow }}-${{ github.ref }}-${{
-    ((github.event.action == 'opened' || github.event.action == 'synchronize') && 'replay') ||
-    ((github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 're-record-tests')) && 'rerecord' ||
-    'no-run')
+    github.event.action == 'labeled' && (
+      contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'no-run'
+    ) || 'replay'
     }}
   cancel-in-progress: true
 
 jobs:
   discover-tests:
     if: |
-      github.event_name == 'push' ||
-      github.event_name == 'schedule' ||
-      github.event_name == 'workflow_dispatch' ||
-      github.event.action == 'opened' ||
-      github.event.action == 'synchronize' ||
-      (github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 're-record-tests'))
+      github.event.action != 'labeled' ||
+      contains(github.event.pull_request.labels.*.name, 're-record-tests')
     runs-on: ubuntu-latest
     outputs:
       test-types: ${{ steps.generate-test-types.outputs.test-types }}
diff --git a/.github/workflows/integration-vision-tests.yml b/.github/workflows/integration-vision-tests.yml
index 28f11fe94..cad945045 100644
--- a/.github/workflows/integration-vision-tests.yml
+++ b/.github/workflows/integration-vision-tests.yml
@@ -30,27 +30,23 @@ on:
 
 concurrency:
   # This creates three concurrency groups:
-  #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for valid triggers with re-record-tests label)
-  #   ${{ github.workflow }}-${{ github.ref }}-replay (for valid triggers without re-record-tests label)
-  #   ${{ github.workflow }}-${{ github.ref }}-no-run (for invalid triggers that will be skipped)
+  #   ${{ github.workflow }}-${{ github.ref }}-rerecord (for labeled events with re-record-tests label)
+  #   ${{ github.workflow }}-${{ github.ref }}-replay (for all non-labeled events)
+  #   ${{ github.workflow }}-${{ github.ref }}-no-run (for labeled events without re-record-tests label)
   # The "no-run" group ensures that irrelevant label events don't interfere with the real workflows.
   group: >-
     ${{ github.workflow }}-${{ github.ref }}-${{
-    ((github.event.action == 'opened' || github.event.action == 'synchronize') && 'replay') ||
-    ((github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 're-record-tests')) && 'rerecord' ||
-    'no-run')
+    github.event.action == 'labeled' && (
+      contains(github.event.pull_request.labels.*.name, 're-record-tests') && 'rerecord' || 'no-run'
+    ) || 'replay'
     }}
   cancel-in-progress: true
 
 jobs:
   discover-tests:
     if: |
-      github.event_name == 'push' ||
-      github.event_name == 'schedule' ||
-      github.event_name == 'workflow_dispatch' ||
-      github.event.action == 'opened' ||
-      github.event.action == 'synchronize' ||
-      (github.event.action == 'labeled' && contains(github.event.pull_request.labels.*.name, 're-record-tests'))
+      github.event.action != 'labeled' ||
+      contains(github.event.pull_request.labels.*.name, 're-record-tests')
     runs-on: ubuntu-latest
     outputs:
       rerecord-tests: ${{ steps.check-rerecord-tests.outputs.rerecord-tests }}