diff --git a/.drone.yml b/.drone.yml
index c85cb891d..547af16f5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,6 +10,7 @@ node_selector:
 trigger:
   event:
     - tag
+    - push
 steps:
 - name: docker
   image: plugins/docker
@@ -36,6 +37,7 @@ node_selector:
 trigger:
   event:
     - tag
+    - push
 steps:
 - name: docker
   image: plugins/docker
@@ -62,11 +64,12 @@ node_selector:
 trigger:
   event:
     - tag
+    - push
 steps:
-- name: manifest-version
+- name: manifest
   image: plugins/manifest
   settings:
-    spec: docker/manifest.version.tmpl
+    spec: docker/manifest.tmpl
     username:
       from_secret: docker_username
     password:
@@ -76,29 +79,3 @@ steps:
 depends_on:
   - linux-amd64
   - linux-arm64
----
-kind: pipeline
-type: kubernetes
-name: manifest-latest
-platform:
-  os: linux
-  arch: arm64
-node_selector:
-  kubernetes.io/arch: arm64
-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
deleted file mode 100644
index e84f4e38f..000000000
--- a/docker/manifest.latest.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-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.version.tmpl b/docker/manifest.tmpl
similarity index 100%
rename from docker/manifest.version.tmpl
rename to docker/manifest.tmpl