diff --git a/.drone.yml b/.drone.yml
index 751a366..dd91b34 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,8 +17,6 @@ pipeline:
     image: plugins/docker
     dockerfile: docker/Dockerfile.linux.amd64
     repo: drone/git
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
     secrets:
     - docker_username
     - docker_password
@@ -71,3 +69,40 @@ secrets:
   docker_password:
     external:
       name: drone/docker#password
+
+---
+metadata:
+  name: linux-arm
+
+platform:
+  name: linux/arm
+
+pipeline:
+- test:
+    image: arm32v7/golang:1.10.3
+    commands:
+    - cd posix
+    - tar -xf fixtures.tar -C /
+    - go test -v
+
+- publish:
+    image: plugins/docker:linux-arm
+    dockerfile: docker/Dockerfile.linux.arm
+    repo: drone/git
+    auto_tag: true
+    auto_tag_suffix: linux-arm
+    secrets:
+    - docker_username
+    - docker_password
+    when:
+      event:
+      - push
+      - tag
+
+secrets:
+  docker_username:
+    external:
+      name: drone/docker#username
+  docker_password:
+    external:
+      name: drone/docker#password
diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm
index 3c4cb6b..cc548d5 100644
--- a/docker/Dockerfile.linux.arm
+++ b/docker/Dockerfile.linux.arm
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM arm32v6/alpine:3.6
 RUN apk add --no-cache ca-certificates git openssh curl perl
 
 ADD posix/* /usr/local/bin/