diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 18630a8886..cdd57c7eca 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -128,21 +128,21 @@ jobs:
         run: ./scripts/build.sh /tmp/e2e-test/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
       - name: Start prometheus
         # Only run for the original repo; a forked repo won't have access to the monitoring credentials
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: bash -x ./scripts/run_prometheus.sh
         env:
           PROMETHEUS_ID: ${{ secrets.PROMETHEUS_ID }}
           PROMETHEUS_PASSWORD: ${{ secrets.PROMETHEUS_PASSWORD }}
       - name: Start promtail
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: bash -x ./scripts/run_promtail.sh
         env:
           LOKI_ID: ${{ secrets.LOKI_ID }}
           LOKI_PASSWORD: ${{ secrets.LOKI_PASSWORD }}
       - name: Notify of metrics availability
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: .github/workflows/notify-metrics-availability.sh
         env:
@@ -189,21 +189,21 @@ jobs:
         run: ./scripts/build.sh /tmp/e2e-test/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
       - name: Start prometheus
         # Only run for the original repo; a forked repo won't have access to the monitoring credentials
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: bash -x ./scripts/run_prometheus.sh
         env:
           PROMETHEUS_ID: ${{ secrets.PROMETHEUS_ID }}
           PROMETHEUS_PASSWORD: ${{ secrets.PROMETHEUS_PASSWORD }}
       - name: Start promtail
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: bash -x ./scripts/run_promtail.sh
         env:
           LOKI_ID: ${{ secrets.LOKI_ID }}
           LOKI_PASSWORD: ${{ secrets.LOKI_PASSWORD }}
       - name: Notify of metrics availability
-        if: (github.event.pull_request.head.repo.full_name == github.repository) || (github.event.repository.fork == false)
+        if: (github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == github.repository)
         shell: bash
         run: .github/workflows/notify-metrics-availability.sh
         env: