diff --git a/.drone.yml b/.drone.yml
index af13f07..4ad6148 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,11 +16,15 @@ steps:
     image: node
     commands:
       - yarn
+    depends_on:
+      - restore-cache
 
   - name: build
     image: node
     commands:
       - yarn build
+    depends_on:
+      - dependencies
 
   - name: upload_build_versioned
     image: plugins/s3
@@ -34,6 +38,11 @@ steps:
       target: /${DRONE_COMMIT_SHA:0:8}/
       path_style: true
       endpoint: https://artifacts.fromouter.space
+    when:
+      event:
+        - push
+    depends_on:
+      - build
 
   - name: upload_build_pr
     image: plugins/s3
@@ -50,6 +59,8 @@ steps:
     when:
       event:
         - pull_request
+    depends_on:
+      - build
 
   - name: upload_build_master
     image: plugins/s3
@@ -64,18 +75,26 @@ steps:
       path_style: true
       endpoint: https://artifacts.fromouter.space
     when:
+      event:
+        - push
       branch:
         - master
+    depends_on:
+      - build
 
   - name: test
     image: node
     commands:
       - yarn test:unit
+    depends_on:
+      - dependencies
 
   - name: coverage
     image: node
     commands:
       - yarn test:unit --coverage
+    depends_on:
+      - dependencies
 
   - name: upload_coverage
     image: plugins/s3
@@ -89,6 +108,11 @@ steps:
       target: /${DRONE_COMMIT_SHA:0:8}/
       path_style: true
       endpoint: https://artifacts.fromouter.space
+    when:
+      event:
+        - push
+    depends_on:
+      - coverage
 
   - name: upload_coverage_pr
     image: plugins/s3
@@ -105,6 +129,8 @@ steps:
     when:
       event:
         - pull_request
+    depends_on:
+      - coverage
 
   - name: rebuild-cache
     image: drillster/drone-volume-cache
@@ -115,3 +141,5 @@ steps:
       rebuild: true
       mount:
         - ./node_modules
+    depends_on:
+      - dependencies