diff --git a/.drone.yml b/.drone.yml
index ff7d990..d56d5e5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,18 +6,12 @@ name: default
 steps:
   - name: debug
     image: alpine
-    environment:
-
     commands:
       - 'echo "Repository: glenux/service-drone-server"'
       - 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
 
   - name: publish:commit_sha
     image: plugins/docker
-    # pull: never
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
     environment:
       DOCKER_REPO: glenux/service-drone-server
     settings:
@@ -25,46 +19,14 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-drone-server:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-drone-server
-      tags: "${DRONE_COMMIT_SHA:0:8}"
+      tags:
+        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH/\\//-}_latest"
+        - "latest"
       purge: false
 
-  - name: publish:commit_branch
-    image: plugins/docker
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-drone-server
-      tags: "latest_${DRONE_BRANCH/\\//-}"
-      purge: false
-    when:
-      branch:
-        - "master"
-        - "develop"
-        - "feature/*"
-
-  - name: publish:latest
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-server:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-drone-server
-      tags: latest
-      purge: false
-    when:
-      branch:
-        - master
-
 #   - name: deploy:dokku
 #     image: alpine
 #     when:
@@ -88,7 +50,7 @@ steps:
 #       - ssh -o StrictHostKeyChecking=no
 #             -i ~/.ssh/deploy_key
 #             "$SSH_USER@$SSH_HOST"
-#             git:from-image automation
+#             git:from-image cicd
 #             "glenux/service-drone-server:${DRONE_COMMIT_SHA:0:8}"
 #             #
 
diff --git a/Dockerfile b/Dockerfile
index 5b23e89..e5fa5d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
-FROM drone/drone:2.22.0
 # FROM drone/drone:2.20.0
+# FROM drone/drone:2.22.0
+FROM drone/drone:2.24.0
 
 COPY entrypoint-wrapper.sh /usr/bin/entrypoint-wrapper
 
 ENTRYPOINT ["/usr/bin/entrypoint-wrapper"]
+
diff --git a/README.md b/README.md
index 5c0d0fc..935b976 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,5 @@ Deploy
     git remote add dokku dokku@dokku.example.com:cicd
     git push dokku master
 
+    dokku git:from-image cicd "glenux/service-drone-server:$IMAGE_TAG"
+