diff --git a/tasks/custom_volumes.yml b/tasks/custom_volumes.yml
new file mode 100644
index 0000000..d0cad1b
--- /dev/null
+++ b/tasks/custom_volumes.yml
@@ -0,0 +1,36 @@
+---
+- name: create drone exchange directory
+  file:
+    path: /var/drone
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+  register: drone_agent_config
+
+- name: create exchange path for build artifacts
+  file:
+    path: /var/builds
+    state: directory
+    owner: root
+    group: www-data
+    mode: 0775
+  register: drone_agent_config
+
+- name: create exchange path for signal build artifacts
+  file:
+    path: /var/builds/signal
+    state: directory
+    owner: root
+    group: www-data
+    mode: 0775
+  register: drone_agent_config
+
+- name: create exchange path for fenix build artifacts
+  file:
+    path: /var/builds/fenix
+    state: directory
+    owner: root
+    group: www-data
+    mode: 0775
+  register: drone_agent_config
diff --git a/tasks/drone-agent.yml b/tasks/drone-agent.yml
index 41b75c3..353fd1b 100644
--- a/tasks/drone-agent.yml
+++ b/tasks/drone-agent.yml
@@ -16,6 +16,8 @@
   tags:
     - configuration
 
+- include_tasks: custom_volumes.yml
+
 - name: run drone agent
   docker_container:
     name: "drone-agent"
@@ -24,6 +26,8 @@
     restart_policy: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      - /var/drone:/var/drone
+      - /var/builds:/var/builds
     env_file: /etc/drone/drone-agent.env
   when: drone_agent_config is defined and drone_agent_config.changed
   tags: