diff --git a/.woodpecker/otp-stable-musl.yaml b/.woodpecker/otp-stable-musl.yaml
index 4663a4401..96be0bf8e 100644
--- a/.woodpecker/otp-stable-musl.yaml
+++ b/.woodpecker/otp-stable-musl.yaml
@@ -48,7 +48,7 @@ steps:
     commands:
       - apk add git build-base cmake file-dev openssl vips-dev zip
       - <<: *pleroma_build_cmds
-      - zip -9rq pleroma-stable-${CI_COMMIT_SHA}-amd64-musl.zip release
+      - zip -9rq pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64-musl.zip release
 
   upload-artifacts-amd64-musl:
     image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
@@ -56,10 +56,10 @@ steps:
       - evaluate: platform == "linux/amd64"
     settings:
       <<: *artifacts_uploader_settings
-      package_name: pleroma-otp-stable-amd64-musl
-      package_version: stable-${CI_COMMIT_SHA}-amd64-musl
-      file_source: ./pleroma-stable-${CI_COMMIT_SHA}-amd64-musl.zip
-      file_name: ./pleroma-stable-${CI_COMMIT_SHA}-amd64-musl.zip
+      package_name: pleroma-otp-${CI_COMMIT_BRANCH}-amd64-musl
+      package_version: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64-musl
+      file_source: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64-musl.zip
+      file_name: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64-musl.zip
 
   otp-stable-arm64-musl:
     image: docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-alpine-3.22.1
@@ -71,7 +71,7 @@ steps:
     commands:
       - apk add git build-base cmake file-dev openssl vips-dev zip
       - <<: *pleroma_build_cmds
-      - zip -9rq pleroma-stable-${CI_COMMIT_SHA}-arm64-musl.zip release
+      - zip -9rq pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64-musl.zip release
 
   upload-artifacts-arm64-musl:
     image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
@@ -79,7 +79,7 @@ steps:
       - evaluate: platform == "linux/arm64"
     settings:
       <<: *artifacts_uploader_settings
-      package_name: pleroma-otp-stable-arm64-musl
-      package_version: stable-${CI_COMMIT_SHA}-arm64-musl
-      file_source: ./pleroma-stable-${CI_COMMIT_SHA}-arm64-musl.zip
-      file_name: ./pleroma-stable-${CI_COMMIT_SHA}-arm64-musl.zip
+      package_name: pleroma-otp-${CI_COMMIT_BRANCH}-arm64-musl
+      package_version: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64-musl
+      file_source: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64-musl.zip
+      file_name: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64-musl.zip
diff --git a/.woodpecker/otp-stable.yaml b/.woodpecker/otp-stable.yaml
index afb23eada..ae2670a79 100644
--- a/.woodpecker/otp-stable.yaml
+++ b/.woodpecker/otp-stable.yaml
@@ -49,7 +49,7 @@ steps:
     commands:
       - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev git build-essential zip
       - <<: *pleroma_build_cmds
-      - zip -9rq pleroma-stable-${CI_COMMIT_SHA}-amd64.zip release
+      - zip -9rq pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64.zip release
 
   upload-artifacts-amd64:
     image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
@@ -57,10 +57,10 @@ steps:
       - evaluate: platform == "linux/amd64"
     settings:
       <<: *artifacts_uploader_settings
-      package_name: pleroma-otp-stable-amd64
-      package_version: stable-${CI_COMMIT_SHA}-amd64
-      file_source: ./pleroma-stable-${CI_COMMIT_SHA}-amd64.zip
-      file_name: ./pleroma-stable-${CI_COMMIT_SHA}-amd64.zip
+      package_name: pleroma-otp-${CI_COMMIT_BRANCH}-amd64
+      package_version: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64
+      file_source: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64.zip
+      file_name: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-amd64.zip
 
   otp-stable-arm64:
     image: docker.io/hexpm/elixir-arm64:1.17.3-erlang-27.3.4.2-ubuntu-noble-20250716
@@ -73,7 +73,7 @@ steps:
     commands:
       - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev git build-essential zip
       - <<: *pleroma_build_cmds
-      - zip -9rq pleroma-stable-${CI_COMMIT_SHA}-arm64.zip release
+      - zip -9rq pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64.zip release
 
   upload-artifacts-arm64:
     image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0
@@ -81,7 +81,7 @@ steps:
       - evaluate: platform == "linux/arm64"
     settings:
       <<: *artifacts_uploader_settings
-      package_name: pleroma-otp-stable-arm64
-      package_version: stable-${CI_COMMIT_SHA}-arm64
-      file_source: ./pleroma-stable-${CI_COMMIT_SHA}-arm64.zip
-      file_name: ./pleroma-stable-${CI_COMMIT_SHA}-arm64.zip
+      package_name: pleroma-otp-${CI_COMMIT_BRANCH}-arm64
+      package_version: ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64
+      file_source: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64.zip
+      file_name: ./pleroma-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}-arm64.zip