diff --git a/.drone.yml b/.drone.yml
index b23682529f..5c58b5284e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -784,7 +784,7 @@ steps:
     image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-amd64
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -802,7 +802,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-amd64-rootless
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -948,7 +948,7 @@ steps:
     image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-arm64
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -969,7 +969,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-arm64-rootless
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=off