diff --git a/.drone.yml b/.drone.yml
index 6def6503d..8bcedc7cb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -259,7 +259,7 @@ pipeline:
     image: plugins/manifest
     secrets: [ docker_username, docker_password ]
     platforms: linux/amd64
-    template: 'gitea/gitea:${DRONE_BRANCH##release/v}-ARCH'
+    template: 'gitea/gitea:${DRONE_BRANCH##release/v}-OS-ARCH'
     target: 'gitea/gitea:${DRONE_BRANCH##release/v}'
     when:
       event: [ push ]
@@ -269,7 +269,7 @@ pipeline:
     image: plugins/manifest
     secrets: [ docker_username, docker_password ]
     platforms: linux/amd64
-    template: gitea/gitea:latest-ARCH
+    template: gitea/gitea:latest-OS-ARCH
     target: gitea/gitea:latest
     when:
       event: [ push, tag ]