diff --git a/.drone.yml b/.drone.yml
index 331fad4c9e92..df84088e65d0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -796,7 +796,7 @@ steps:
     pull: always
     image: plugins/manifest
     settings:
-      auto_tag: false
+      auto_tag: true
       ignore_missing: true
       spec: docker/manifest.rootless.tmpl
       password:
diff --git a/docker/manifest.rootless.tmpl b/docker/manifest.rootless.tmpl
index 2951be8b2d9e..aed36caa4e87 100644
--- a/docker/manifest.rootless.tmpl
+++ b/docker/manifest.rootless.tmpl
@@ -2,7 +2,7 @@ image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
-  - {{this}}
+  - {{this}}-rootless
 {{/each}}
 {{/if}}
 manifests: