diff --git a/docker-compose.yml b/docker-compose.yml
index c7aaed5..949c4b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,7 @@ include:
   - services/netbootxyz.yml
   - services/registry.yml
   - services/portainer.yml
+  - services/drone/drone.yml
 
 
 services:
diff --git a/services/drone/drone.env b/services/drone/drone.env
new file mode 100644
index 0000000..3744b8a
--- /dev/null
+++ b/services/drone/drone.env
@@ -0,0 +1,3 @@
+DRONE_RPC_SECRET=c9abde046b241975770a775fca86e4c9
+DRONE_SERVER_HOST=drone.${DOMAIN}
+DRONE_RPC_HOST=${DRONE_SERVER_HOST}
\ No newline at end of file
diff --git a/services/drone/drone.yml b/services/drone/drone.yml
new file mode 100644
index 0000000..d624d6e
--- /dev/null
+++ b/services/drone/drone.yml
@@ -0,0 +1,44 @@
+---
+services:
+  drone:
+    image: drone/drone:1
+    container_name: drone
+    ports:
+      - 5443:443
+      - 580:80
+    networks:
+      public:
+        ipv4_address: 192.168.240.47
+    volumes:
+      - ${DOCKER_STORAGE_PATH}/drone:/data
+    env_file:
+      - drone.env
+    environment:
+      - DRONE_GITEA_CLIENT_ID=0d11d359-a420-4a66-a04c-0a136448b7e7
+      - DRONE_GITEA_CLIENT_SECRET=Qx0LqE0Qb-M3MZAiojtlILRY3nfNzOiUUTdOCpW7Feo=
+      - DRONE_GITEA_SERVER=https://git.${DOMAIN}
+      - DRONE_SERVER_PROTO=https
+      - DRONE_USER_CREATE=username:lukas,admin:true
+    profiles:
+      - base
+    restart: unless-stopped
+
+  drone-runner:
+    image: drone/drone-runner-docker:1
+    container_name: drone-runner
+    ports:
+      - 3500:3000
+    networks:
+      public:
+        ipv4_address: 192.168.240.48
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    env_file:
+      - drone.env
+    environment:
+      - DRONE_RPC_PROTO=https
+      - DRONE_RUNNER_CAPACITY=1
+      - DRONE_RUNNER_NAME=nas-docker-runner
+    profiles:
+      - base
+    restart: unless-stopped