diff --git a/.drone.yml b/.drone.yml
index fdf353603..ebf02370e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -53,7 +53,7 @@ steps:
 ---
 kind: pipeline
 type: kubernetes
-name: manifest
+name: manifest-version
 platform:
   os: linux
   arch: arm64
@@ -63,16 +63,42 @@ trigger:
   event:
     - tag
 steps:
-- name: manifest
+- name: manifest-version
   image: plugins/manifest
   settings:
-    spec: docker/manifest.tmpl
+    spec: docker/manifest.version.tmpl
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
     auto_tag: true
     ignore_missing: true
-depends_on:
-  - linux-amd64
-  - linux-arm64
\ No newline at end of file
+  depends_on:
+    - linux-amd64
+    - linux-arm64
+---
+kind: pipeline
+type: kubernetes
+name: manifest-latest
+platform:
+  os: linux
+  arch: amd64
+node_selector:
+  kubernetes.io/arch: amd64
+trigger:
+  event:
+    - tag
+steps:
+- name: manifest-latest
+  image: plugins/manifest
+  settings:
+    spec: docker/manifest.latest.tmpl
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    auto_tag: true
+    ignore_missing: true
+  depends_on:
+    - linux-amd64
+    - linux-arm64
\ No newline at end of file
diff --git a/docker/manifest.latest.tmpl b/docker/manifest.latest.tmpl
new file mode 100644
index 000000000..e84f4e38f
--- /dev/null
+++ b/docker/manifest.latest.tmpl
@@ -0,0 +1,10 @@
+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
diff --git a/docker/manifest.tmpl b/docker/manifest.version.tmpl
similarity index 60%
rename from docker/manifest.tmpl
rename to docker/manifest.version.tmpl
index ecc4e7285..3bb473750 100644
--- a/docker/manifest.tmpl
+++ b/docker/manifest.version.tmpl
@@ -1,4 +1,3 @@
-# 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}}-linux-amd64{{else}}latest-linux-amd64{{/if}}
@@ -9,15 +8,3 @@ manifests:
     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