diff --git a/.github/workflows/publishdocker-branch.yml b/.github/workflows/publishdocker-branch.yml
index e6734393..b8a6b336 100644
--- a/.github/workflows/publishdocker-branch.yml
+++ b/.github/workflows/publishdocker-branch.yml
@@ -1,5 +1,7 @@
 name: Publish Docker Branch
-on: [push]
+on:
+  push:
+    branches: [master, beta, nightly]
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/publishdocker-release.yml b/.github/workflows/publishdocker-release.yml
index 5e8e1c2c..b4bf5226 100644
--- a/.github/workflows/publishdocker-release.yml
+++ b/.github/workflows/publishdocker-release.yml
@@ -1,7 +1,8 @@
 name: Publish Docker Release
 on:
-  release:
-    types: [published, prereleased]
+  push:
+    tags:
+      - 'v*'
 jobs:
   build:
     runs-on: ubuntu-latest