diff --git a/.woodpecker/.release.yml b/.woodpecker/.release.yml
index 21b88a67d..17bb4b0e4 100644
--- a/.woodpecker/.release.yml
+++ b/.woodpecker/.release.yml
@@ -16,12 +16,12 @@ pipeline:
   glibc:
     when:
       event:
+        - push
         - tag
       branch:
         - develop
         - stable
         - refs/tags/v*
-        - refs/tags/test-*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -55,6 +55,7 @@ pipeline:
       branch:
         - develop
         - stable
+        - refs/tags/v*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -75,12 +76,13 @@ 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:
@@ -90,6 +92,7 @@ pipeline:
       branch:
         - develop
         - stable
+        - refs/tags/v*
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
@@ -112,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