diff --git a/.drone.yml b/.drone.yml
index 80d32f2..1fe2a74 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,44 +1,59 @@
 ---
 kind: pipeline
-ype: docker
+type: docker
 name: default
 
-environment:
-  DOCKERHUB_USERNAME:
-    from_secret: DOCKERHUB_USERNAME
-  DOCKERHUB_PASSWORD:
-    from_secret: DOCKERHUB_PASSWORD
+#environment:
+# DOCKER_REPO: glenux/service-ntfy
 
 steps:
-  - name: docker
+  - name: publish:commit_sha
     image: plugins/docker
+    # pull: never
+    volumes:
+      - name: cache
+        path: /stupid
     settings:
-      username: ${DOCKERHUB_USERNAME}
-      password: ${DOCKERHUB_PASSWORD}
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      # cache_from: glenux/service-ntfy
       repo: glenux/service-ntfy
-      tags: ${DRONE_BRANCH//\//-}-${DRONE_COMMIT_SHA:0:8}
+      tags: "${DRONE_COMMIT_SHA:0:8}"
 
-  - name: docker
+  - name: publish:commit_branch
     image: plugins/docker
+    volumes:
+      - name: cache
+        path: /stupid
     settings:
-      username: ${DOCKERHUB_USERNAME}
-      password: ${DOCKERHUB_PASSWORD}
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      # cache_from: glenux/service-ntfy
       repo: glenux/service-ntfy
-      tags: latest_${DRONE_BRANCH}
+      tags: "latest_${DRONE_BRANCH/\\//-}"
     when:
       branch:
-        - master
-        - develop
-        - feature/*
+        - "master"
+        - "develop"
+        - "feature/*"
 
-  - name: docker
-    image: plugins/docker
-    settings:
-      username: ${DOCKERHUB_USERNAME}
-      password: ${DOCKERHUB_PASSWORD}
-      repo: glenux/service-ntfy
-      tags: latest
-    when:
-      branch:
-        - master
+      # - name: docker
+      #   image: plugins/docker
+      #   settings:
+      #     username: "${DOCKERHUB_USERNAME}"
+      #     password: "${DOCKERHUB_PASSWORD}"
+      #     repo: glenux/service-ntfy
+      #     tags: latest
+      #   when:
+      #     branch:
+      # - master
+
+volumes:
+  - name: cache
+    temp: {}
 #
+