diff --git a/.drone.yml b/.drone.yml
index 9dbee15..0320524 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,22 +19,14 @@ steps:
       - hadolint  Dockerfile
 
   # Bauen, taggen und pushen
-  - name: docker_build_and_push
+  - name: docker_build_and_push_master
     image: plugins/docker
     settings:
-      # Dockerhub-Username
-      # als Org-Secret hinterlegt
       username:
         from_secret: DOCKERHUB_USER
-      # Dockerhub-Password
-      # als Org-Secret hinterlegt
       password:
         from_secret: DOCKERHUB_PASS
-      # Container-Registry
-      # registry: hub.docker.com
-      # Name des Containerfiles
       dockerfile: Dockerfile
-      # Repo auf dem Dockerhub
       repo: quotengrote/allzweckcontainer
       tags:
         - latest
@@ -46,3 +38,20 @@ steps:
       event:
         exclude:
           - pull_request
+
+  - name: docker_build_and_push
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/allzweckcontainer
+      tags:
+        - ${DRONE_COMMIT_SHA:0:8}
+        - ${DRONE_COMMIT_BRANCH}
+    when:
+      event:
+        exclude:
+          - pull_request