diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 4635295..3e27149 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -8,8 +8,9 @@ pipeline:
       sonar_key: ${CI_REPO_OWNER}:${CI_REPO_NAME}
       sonar_quality_enabled: true
       branchanalysis: auto
-
-  publish-docker-image:
+  
+  publish-docker-branch-image:
+    group: build
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: git.kle.li/${CI_REPO}
@@ -22,12 +23,12 @@ pipeline:
       password:
         from_secret: gitea_token
     when:
-      branch: [main, test, dev, release/*]
       path:
         exclude: ["*.md", "docs/**"]
         ignore_message: "[FORCE CI]"
 
   publish-docker-tag-image:
+    group: build
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: git.kle.li/${CI_REPO}
@@ -40,7 +41,7 @@ pipeline:
       password:
         from_secret: gitea_token
     when:
-      tag: v*
+      event: tag
       path:
         exclude: ["*.md", "docs/**"]
         ignore_message: "[FORCE CI]"