diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 44f2777..9ee89c8 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -13,6 +13,7 @@ permissions:
 
 jobs:
   build:
+    if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     steps:
       - name: Set REPOSITORY
diff --git a/.github/workflows/dockerrelease.yml b/.github/workflows/dockerrelease.yml
index facc53f..4bc2ef8 100644
--- a/.github/workflows/dockerrelease.yml
+++ b/.github/workflows/dockerrelease.yml
@@ -4,13 +4,12 @@ name: Docker Release
 on:
   release:
     types: [published]
-  workflow_dispatch:
 
 permissions: {}
 
 jobs:
   release:
-    if: github.ref == 'refs/heads/main'
+    if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
       - name: Set REPOSITORY