diff --git a/.drone.yml b/.drone.yml
index fd65a3998..fdf353603 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,8 +23,6 @@ steps:
     auto_tag: true
     auto_tag_suffix: linux-amd64
     platform: 'linux/amd64'
-    tags:
-      - latest
 
 ---
 kind: pipeline
@@ -51,8 +49,6 @@ steps:
     auto_tag: true
     auto_tag_suffix: linux-arm64
     platform: 'linux/arm64'
-    tags:
-      - latest
 
 ---
 kind: pipeline
@@ -77,8 +73,6 @@ steps:
       from_secret: docker_password
     auto_tag: true
     ignore_missing: true
-    tags:
-      - latest
 depends_on:
   - linux-amd64
   - linux-arm64
\ No newline at end of file
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
index ac18becd8..ecc4e7285 100644
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@@ -1,12 +1,23 @@
+# Versioned manifest
 image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 manifests:
-  -
-    image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+  - image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-linux-amd64{{else}}latest-linux-amd64{{/if}}
     platform:
       architecture: amd64
       os: linux
-  -
-    image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+  - image: bottledpills/deluge-openvpn:{{#if build.tag}}{{trimPrefix "v" build.tag}}-linux-arm64{{else}}latest-linux-arm64{{/if}}
+    platform:
+      architecture: arm64
+      os: linux
+---
+# Latest manifest
+image: bottledpills/deluge-openvpn:latest
+manifests:
+  - image: bottledpills/deluge-openvpn:latest-linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: bottledpills/deluge-openvpn:latest-linux-arm64
     platform:
       architecture: arm64
       os: linux
\ No newline at end of file