diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bccd036..c2dc8da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,14 +1,12 @@
 name: Build Docker image and push to release
 
 on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+  release:
+    types: [published]
 
 jobs:
   docker:
-    if: 'github.event.release'
+    if: "!github.event.release.prerelease"
     runs-on: ubuntu-latest
     steps:
       - name: Connect to Tailscale
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 420678e..cf4d861 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -1,14 +1,12 @@
 name: Build Docker image and push to prerelease
 
 on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+  release:
+    types: [published]
 
 jobs:
   docker:
-    if: 'github.event.prerelease'
+    if: github.event.release.prerelease
     runs-on: ubuntu-latest
     steps:
       - name: Connect to Tailscale