diff --git a/.drone.yml b/.drone.yml
index 99da2b368a982..7c75ce6291530 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1312,6 +1312,9 @@ steps:
     pull: always
     settings:
       auto_tag: false
+      tags:
+        - ${DRONE_TAG##v}-rootless
+        - ${DRONE_TAG:1:4}-rootless
       ignore_missing: true
       spec: docker/manifest.rootless.tmpl
       password:
@@ -1323,6 +1326,9 @@ steps:
     image: plugins/manifest
     settings:
       auto_tag: false
+      tags:
+        - ${DRONE_TAG##v}
+        - ${DRONE_TAG:1:4}
       ignore_missing: true
       spec: docker/manifest.tmpl
       password: