diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml
index f8b55effe..17bb4b0e4 100644
--- a/.woodpecker/.release.yml
+++ b/.woodpecker/.release.yml
@@ -17,9 +17,11 @@ pipeline:
     when:
       event:
         - push
+        - tag
       branch:
         - develop
         - stable
+        - refs/tags/v*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -36,21 +38,24 @@ pipeline:
       - echo "import Mix.Config" > config/prod.secret.exs
       - mix local.hex --force
       - mix local.rebar --force
-      - export PLEROMA_BUILD_BRANCH=$CI_COMMIT_BRANCH
+      - export BUILD_TAG=$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}
+      - export PLEROMA_BUILD_BRANCH=$BUILD_TAG
       - mix deps.clean --all
       - mix deps.get --only prod
       - mkdir release
       - mix release --path release
       - zip akkoma-${tag}.zip -r release
-      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$CI_COMMIT_BRANCH/akkoma-${tag}.zip
+      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$BUILD_TAG/akkoma-${tag}.zip
 
   musl:
     when:
       event:
         - push
+        - tag
       branch:
         - develop
         - stable
+        - refs/tags/v*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -71,20 +76,23 @@ pipeline:
 
       - mix local.hex --force
       - mix local.rebar --force
-      - export PLEROMA_BUILD_BRANCH=$CI_COMMIT_BRANCH
+      - export BUILD_TAG=$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}
+      - export PLEROMA_BUILD_BRANCH=$BUILD_TAG
       - mix deps.clean --all 
       - mix deps.get --only prod
       - mix release --path release
       - zip akkoma-${tag}.zip -r release
-      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$CI_COMMIT_BRANCH/akkoma-${tag}-musl.zip
+      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$BUILD_TAG/akkoma-${tag}-musl.zip
 
   musl1.1:
     when:
       event:
         - push
+        - tag
       branch:
         - develop
         - stable
+        - refs/tags/v*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -107,9 +115,10 @@ pipeline:
 
       - mix local.hex --force
       - mix local.rebar --force
-      - export PLEROMA_BUILD_BRANCH=$CI_COMMIT_BRANCH
+      - export BUILD_TAG=$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}
+      - export PLEROMA_BUILD_BRANCH=$BUILD_TAG
       - mix deps.clean --all
       - mix deps.get --only prod
       - mix release --path release
       - zip akkoma-${tag}.zip -r release
-      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$CI_COMMIT_BRANCH/akkoma-${tag}-musl11.zip
+      - rclone copyto akkoma-${tag}.zip scaleway:akkoma-updates/$BUILD_TAG/akkoma-${tag}-musl11.zip