diff --git a/.drone.yaml b/.drone.yaml
index 45da76e..43bcb01 100644
--- a/.drone.yaml
+++ b/.drone.yaml
@@ -11,11 +11,9 @@ triggers:
 
 steps:
   - name: build
-    image: docker:20
+    image: plugins/docker
     commands:
-      - COMMIT_HASH=$(git rev-parse --short HEAD)
-      - IMAGE_TAG=gitea.t000-n.de/t.behrendt/backupsidecar:$COMMIT_HASH
-      - docker build -t $IMAGE_TAG .
+      - docker build -t gitea.t000-n.de/t.behrendt/backupsidecar:${DRONE_COMMIT:0:8} .
 
   - name: push
     image: plugins/docker
@@ -27,4 +25,4 @@ steps:
       repo: gitea.t000-n.de/t.behrendt/backupsidecar
       tags: 
         - latest
-        - $COMMIT_HASH
+        - ${DRONE_COMMIT:0:8}