diff --git a/.drone.yaml b/.drone.yaml
deleted file mode 100644
index 8113ee9..0000000
--- a/.drone.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-pipeline:
-  build:
-    image: ruby:2.2.1
-    commands:
-      - bundle install
-      - bundle exec rake db:setup
-      - bundle exec bin/rspec
-    environment:
-      - RACK_ENV=test
-      - DATABASE_HOST=postgres://postgres@database/myapp_test
-  notify:
-    image: plugins/slack
-    secrets: [ slack_webhook ]
-    when:
-      status: [ success, failure ]
-
-services:
-  database:
-    image: postgres
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..6d6fd8d
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,30 @@
+pipeline:
+  restore-cache:
+    image: drillster/drone-volume-cache
+    restore: true
+    mount:
+      - ./.bundle
+    volumes:
+      - /tmp/cache:/cache
+
+  build:
+    image: ruby:2.2.1
+    commands:
+      - bundle install --path=.bundle/gems --without development production staging
+      - bundle exec rake db:setup
+      - bundle exec rake test
+    environment:
+      - RACK_ENV=test
+      - DATABASE_URL=postgres://postgres:postgres@database/myapp_test
+
+  rebuild-cache:
+    image: drillster/drone-volume-cache
+    rebuild: true
+    mount:
+      - ./.bundle
+    volumes:
+      - /tmp/cache:/cache
+
+services:
+  database:
+    image: postgres