diff --git a/drone/arm/Dockerfile b/drone/arm/Dockerfile
new file mode 100644
index 0000000..f8ddc7a
--- /dev/null
+++ b/drone/arm/Dockerfile
@@ -0,0 +1,23 @@
+#
+# Dockerfile for drone-arm
+#
+
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
+
+RUN apk add --no-cache ca-certificates
+
+ADD drone /drone
+
+ENV DATABASE_DRIVER=sqlite3 \
+    DATABASE_CONFIG=/var/lib/drone/drone.sqlite \
+    GODEBUG=netdns=go \
+    XDG_CACHE_HOME=/var/lib/drone
+
+VOLUME $XDG_CACHE_HOME
+WORKDIR $XDG_CACHE_HOME
+
+EXPOSE 8000
+
+ENTRYPOINT ["/drone"]
+CMD ["server"]
diff --git a/drone/arm/docker-compose.yml b/drone/arm/docker-compose.yml
index 6699be6..3e87721 100644
--- a/drone/arm/docker-compose.yml
+++ b/drone/arm/docker-compose.yml
@@ -1,13 +1,28 @@
-drone:
-  image: armdrone/drone
-  ports:
-    - "8000:80"
-  volumes:
-    - ./data:/var/lib/drone
-    - /var/run/docker.sock:/var/run/docker.sock
-  environment:
-    - REMOTE_DRIVER=gogs
-    - REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
-    - PLUGIN_FILTER=armdrone/*
-    - GIN_MODE=release
-  restart: always
+version: '2'
+
+services:
+  drone-server:
+    image: easypi/drone-arm
+    ports:
+      -  "8000:8000"
+    volumes:
+      - ./data:/var/lib/drone
+    environment:
+      - DRONE_OPEN=true
+      - DRONE_HOST=drone.easypi.pro
+      - DRONE_GOGS=true
+      - DRONE_GOGS_URL=https://gogs.easypi.pro
+      - DRONE_SECRET=0123456789
+    restart: always
+
+  drone-agent:
+    image: easypi/drone-arm
+    command: agent
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - DRONE_SERVER=ws://drone-server:8000/ws/broker
+      - DRONE_SECRET=0123456789
+    depends_on:
+      - drone-server
+    restart: always
diff --git a/drone/arm/drone b/drone/arm/drone
new file mode 100755
index 0000000..7c7b575
Binary files /dev/null and b/drone/arm/drone differ