diff --git a/.drone.yml b/.drone.yml
index 4da900f..6c81193 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,6 +12,21 @@ trigger:
 
 steps:
   - name: build-and-publish-container
+    image: plugins/docker
+    settings:
+      registry: git.local-it.org
+      repo: git.local-it.org/ci-builder/mitgliederverwaltung
+      username:
+        from_secret: DRONE_REGISTRY_USERNAME
+      password:
+        from_secret: DRONE_REGISTRY_TOKEN
+      auto_tag: true
+      auto_tag_suffix: ${DRONE_COMMIT_SHA:0:8}
+    when:
+      event:
+        - tag
+  
+  - name: build-and-publish-container-branch
     image: plugins/docker
     settings:
       registry: git.local-it.org
@@ -22,9 +37,10 @@ steps:
         from_secret: DRONE_REGISTRY_TOKEN
       tags:
         - latest
-        - ${DRONE_COMMIT_SHA}
-      auto_tag: true
-      auto_tag_suffix: linux-amd64
+        - ${DRONE_COMMIT_SHA:0:8}
+    when:
+      event:
+        - push
 
 ---
 kind: pipeline