diff --git a/.drone.yml b/.drone.yml
index ad36f6f..6eeeba4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,22 +6,39 @@
 #   - master
 
 pipeline:
+  restore_cache:
+    image: drillster/drone-volume-cache:latest
+    restore: true
+    mount:
+      - /drone/docker
+    # volumes:
+    #   - /tmp/drone-cache:/cache
+
   publish:
     image: plugins/docker:17.12
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
     repo: andrey01/mps-youtube
-    # tags:
-    #   - latest
-    #   - 1
-    #   - 1.1
+    tags:
+      - latest
+      - ${DRONE_COMMIT_SHA}
     # group: docker
     # dockerfile: Dockerfile
-    secrets: [ docker_username, docker_password ]
+    secrets:
+      - docker_username
+      - docker_password
+    storage_path: /drone/docker
+    use_cache: true
     when:
       event: [push, tag]
       branch: master
 
+  rebuild_cache:
+    image: drillster/drone-volume-cache:latest
+    rebuild: true
+    mount:
+      - /drone/docker
+    # volumes:
+    #   - /tmp/drone-cache:/cache
+
   notify:
     image: drillster/drone-email:latest
     from: Drone CI <noreply@nixaid.com>