diff --git a/.drone.sh b/.drone.sh
index 3b9c53bb2a..8e1afe77bd 100755
--- a/.drone.sh
+++ b/.drone.sh
@@ -23,4 +23,6 @@ git clone git@github.com:drone/drone-enterprise.git extras
 
 # build a static binary with the build number and extra features.
 go build -ldflags '-extldflags "-static" -X github.com/drone/drone/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-server github.com/drone/drone/extras/cmd/drone-server
-GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-agent github.com/drone/drone/cmd/drone-agent
+GOOS=linux GOARCH=amd64 CGO_ENABLED=0         go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/drone-agent             github.com/drone/drone/cmd/drone-agent
+GOOS=linux GOARCH=arm64 CGO_ENABLED=0         go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/linux/arm64/drone-agent github.com/drone/drone/cmd/drone-agent
+GOOS=linux GOARCH=arm   CGO_ENABLED=0 GOARM=7 go build -ldflags '-X github.com/drone/drone/version.VersionDev=build.'${DRONE_BUILD_NUMBER} -o release/linux/arm/drone-agent   github.com/drone/drone/cmd/drone-agent
diff --git a/.drone.yml b/.drone.yml
index 5e13a6305f..10cc9c1552 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -56,6 +56,26 @@ pipeline:
       branch: master
       event: push
 
+  publish_agent_arm:
+    image: plugins/docker
+    repo: drone/agent
+    dockerfile: Dockerfile.agent.linux.arm
+    secrets: [ docker_username, docker_password ]
+    tag: [ linux-arm ]
+    when:
+      branch: master
+      event: push
+
+  publish_agent_arm64:
+    image: plugins/docker
+    repo: drone/agent
+    dockerfile: Dockerfile.agent.linux.arm64
+    secrets: [ docker_username, docker_password ]
+    tag: [ linux-arm64 ]
+    when:
+      branch: master
+      event: push
+
   release_server:
     image: plugins/docker
     repo: drone/drone
diff --git a/Dockerfile.agent.linux.arm b/Dockerfile.agent.linux.arm
new file mode 100644
index 0000000000..f6d2a8ffeb
--- /dev/null
+++ b/Dockerfile.agent.linux.arm
@@ -0,0 +1,8 @@
+# docker build --rm -t drone/drone .
+
+FROM centurylink/ca-certs
+ENV GODEBUG=netdns=go
+ENV DRONE_PLATFORM=linux/arm
+ADD release/linux/arm/drone-agent /bin/
+
+ENTRYPOINT ["/bin/drone-agent"]
diff --git a/Dockerfile.agent.linux.arm64 b/Dockerfile.agent.linux.arm64
new file mode 100644
index 0000000000..90c926fc09
--- /dev/null
+++ b/Dockerfile.agent.linux.arm64
@@ -0,0 +1,8 @@
+# docker build --rm -t drone/drone .
+
+FROM centurylink/ca-certs
+ENV GODEBUG=netdns=go
+ENV DRONE_PLATFORM=linux/arm64
+ADD release/linux/arm64/drone-agent /bin/
+
+ENTRYPOINT ["/bin/drone-agent"]