diff --git a/.woodpecker/docker-stable-combine.yaml b/.woodpecker/docker-stable-combine.yaml
index e011750f1..e07e7a83c 100644
--- a/.woodpecker/docker-stable-combine.yaml
+++ b/.woodpecker/docker-stable-combine.yaml
@@ -13,11 +13,13 @@ skip_clone: true
 steps:
   docker-stable-combine:
     image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
-    settings:
+    when:
+      - event: push
+    settings: &docker_settings
       registry: "git.fluffytail.org"
       image: "pleroma-test/pleroma"
       architectures: [amd64, arm64]
-      tags:
+      tags: &docker_tags
         - latest
         - stable
         - ${CI_COMMIT_SHA}
@@ -25,3 +27,13 @@ steps:
         from_secret: pleroma-ci-user
       password:
         from_secret: pleroma-ci-password
+
+  docker-stable-tag-combine:
+    image: git.fluffytail.org/phnt/wpc-docker-tagger:latest
+    when:
+      - event: tag
+    settings:
+      <<: *docker_settings
+      tags:
+        - <<: *docker_tags
+        - ${CI_COMMIT_TAG}
diff --git a/.woodpecker/docker-stable.yaml b/.woodpecker/docker-stable.yaml
index 6c5e31091..dcf98e31f 100644
--- a/.woodpecker/docker-stable.yaml
+++ b/.woodpecker/docker-stable.yaml
@@ -23,30 +23,51 @@ variables:
       from_secret: pleroma-ci-user
     password:
       from_secret: pleroma-ci-password
+  kaniko_image: &kaniko_image woodpeckerci/plugin-kaniko:2.3.1
 
 steps:
   docker-stable-amd64:
-    image: woodpeckerci/plugin-kaniko:2.3.1
+    image: *kaniko_image
     # when:
     #   - platform: linux/amd64
     # does not work even though it should according to docs
     # https://github.com/woodpecker-ci/woodpecker/discussions/5367#discussioncomment-13901342
     when:
-      - evaluate: platform == "linux/amd64"
+      - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "push"'
     settings:
       <<: *docker_variables
-      tags:
+      tags: &amd64_tags
         - latest-amd64
         - stable-amd64
         - ${CI_COMMIT_SHA}-amd64
 
-  docker-stable-arm64:
-    image: woodpeckerci/plugin-kaniko:2.3.1
+  docker-stable-tag-amd64:
+    image: *kaniko_image
     when:
-      - evaluate: platform == "linux/arm64"
+      - evaluate: 'platform == "linux/amd64" && CI_PIPELINE_EVENT == "tag"'
     settings:
       <<: *docker_variables
       tags:
+        - <<: *amd64_tags
+        - ${CI_COMMIT_TAG}-amd64
+
+  docker-stable-arm64:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "push"'
+    settings:
+      <<: *docker_variables
+      tags: &arm64_tags
         - latest-arm64
         - stable-arm64
         - ${CI_COMMIT_SHA}-arm64
+
+  docker-stable-tag-arm64:
+    image: *kaniko_image
+    when:
+      - evaluate: 'platform == "linux/arm64" && CI_PIPELINE_EVENT == "tag"'
+    settings:
+      <<: *docker_variables
+      tags:
+        - <<: *arm64_tags
+        - ${CI_COMMIT_TAG}-arm64