diff --git a/.drone.yml b/.drone.yml
index 4dca061..0c6b6c0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,6 @@
 ---
 kind: pipeline
-name: linux-amd64
-
-# depends_on:
-#   - tests
+name: docker builds
 
 trigger:
   event:
@@ -14,69 +11,35 @@ trigger:
     - refs/tags/v*
 
 steps:
-  - name: build
+  - name: build amd64
     image: plugins/docker
     settings:
       repo: iamthefij/multiarch-pipeline-test
       auto_tag: true
-      auto_tag_suffix: linux-amd64
+      auto_tag_suffix: drone-amd64
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-
----
-kind: pipeline
-name: linux-arm
-
-# depends_on:
-#   - tests
-
-trigger:
-  event:
-    - push
-    - tag
-  ref:
-    - refs/heads/master
-    - refs/tags/v*
-
-steps:
-  - name: build
+  - name: build arm32v7
     image: plugins/docker
     settings:
       repo: iamthefij/multiarch-pipeline-test
       auto_tag: true
-      auto_tag_suffix: linux-arm
+      auto_tag_suffix: drone-arm
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
       build_args:
         - ARCH=arm
-        - REPO=arm32v6
-
----
-kind: pipeline
-name: linux-arm64
-
-# depends_on:
-#   - tests
-
-trigger:
-  event:
-    - push
-    - tag
-  ref:
-    - refs/heads/master
-    - refs/tags/v*
-
-steps:
-  - name: build
+        - REPO=arm32v7
+  - name: build-arm64
     image: plugins/docker
     settings:
       repo: iamthefij/multiarch-pipeline-test
       auto_tag: true
-      auto_tag_suffix: linux-arm64
+      auto_tag_suffix: drone-arm64
       username:
         from_secret: docker_username
       password:
@@ -84,50 +47,13 @@ steps:
       build_args:
         - ARCH=aarch64
         - REPO=arm64v8
-
----
-kind: pipeline
-name: manifest
-
-depends_on:
-  - linux-amd64
-  - linux-arm
-  - linux-arm64
-
-trigger:
-  event:
-    - push
-    - tag
-  ref:
-    - refs/heads/master
-    - refs/tags/v*
-
-steps:
   - name: publish manifest
     image: plugins/manifest
     settings:
-      spec: manifest.tmpl
+      spec: drone-manifest.tmpl
       auto_tag: true
       ignore_missing: true
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-
-# ---
-# kind: pipeline
-# name: tests
-#
-# trigger:
-#   event:
-#     - push
-#     - tag
-#
-# steps:
-#   - name: run tests
-#     image: ubuntu:bionic
-#     commands:
-#       - apt-get update
-#       - apt-get install -y make
-#       - make test
-
diff --git a/manifest.tmpl b/drone-manifest.tmpl
similarity index 81%
rename from manifest.tmpl
rename to drone-manifest.tmpl
index 7f1ee85..ee93c20 100644
--- a/manifest.tmpl
+++ b/drone-manifest.tmpl
@@ -7,18 +7,18 @@ tags:
 {{/if}}
 manifests:
   -
-    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}drone-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}drone-arm64
     platform:
       architecture: arm64
       os: linux
       variant: v8
   -
-    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    image: iamthefij/multiarch-pipeline-test:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}drone-arm
     platform:
       architecture: arm
       os: linux