diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e815628612..f3c610b875 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,12 @@
 name: Build CI
 
-on: [push, pull_request, release]
+on:
+  push:
+  pull_request:
+  release:
+    types: [published]
+  check_suite:
+    types: [rerequested]
 
 jobs:
   test:
@@ -10,9 +16,6 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - name: Fail if not a release publish # workaround has `on` doesn't have this filter
-      run: exit 1
-      if: github.event_name == 'release' && (github.event.action != 'published' && github.event.action != 'rerequested')
     - name: Set up Python 3.5
       uses: actions/setup-python@v1
       with:
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index ce93237021..69ca8f12b9 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -1,6 +1,8 @@
 name: Update CircuitPython.org
 
-on: release
+on:
+  release:
+    types: [published]
 
 jobs:
   website:
@@ -10,9 +12,6 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - name: Fail if not a release publish # workaround has `on` doesn't have this filter
-      run: exit 1
-      if: github.event.action != 'published'
     - name: Set up Python 3.5
       uses: actions/setup-python@v1
       with: