diff --git a/.drone.yml b/.drone.yml
index 2bf5459..710910c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-name: build and publish amd64
+name: build_amd64
 platform:
   os: linux
   arch: amd64
@@ -23,31 +23,6 @@ steps:
       dockerfile: ./pacoloco/Dockerfile
       context: ./pacoloco
 
----
-kind: pipeline
-name: build and publish arm
-platform:
-  os: linux
-  arch: arm
-
-steps:
-  - name: clone repo
-    image: alpine/git
-    commands:
-      - git clone https://github.com/anatol/pacoloco.git
-  - name: docker
-    image: plugins/docker
-    settings:
-      repo: ducampsv/pacoloco
-      auto_tag: "true"
-      auto_tag_suffix: arm
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: ./pacoloco/Dockerfile
-      context: ./pacoloco
-
 ---
 kind: pipeline
 type: docker
@@ -58,11 +33,38 @@ steps:
     image: plugins/manifest
     settings:
       auto_tag: "true"
-      ignore_missing: "true"
-      spec: docker/manifest.tmpl
+      target: ducampsv/pacoloco:latest
+      template: ducampsv/pacoloco:ARCH
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
+      platforms:
+        - linux/amd64
+        - linux/arm
 depends_on:
-  - build and publish amd64
+  - build_amd64
+#---
+#kind: pipeline
+#name: build_arm
+#platform:
+#  os: linux
+#  arch: arm
+#
+#steps:
+#  - name: clone repo
+#    image: alpine/git
+#    commands:
+#      - git clone https://github.com/anatol/pacoloco.git
+#  - name: docker
+#    image: plugins/docker
+#    settings:
+#      repo: ducampsv/pacoloco
+#      auto_tag: "true"
+#      auto_tag_suffix: arm
+#      username:
+#        from_secret: docker_username
+#      password:
+#        from_secret: docker_password
+#      dockerfile: ./pacoloco/Dockerfile
+#      context: ./pacoloco