diff --git a/.drone.yml b/.drone.yml
index 6c81193..4da900f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,21 +12,6 @@ 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
@@ -37,10 +22,9 @@ steps:
         from_secret: DRONE_REGISTRY_TOKEN
       tags:
         - latest
-        - ${DRONE_COMMIT_SHA:0:8}
-    when:
-      event:
-        - push
+        - ${DRONE_COMMIT_SHA}
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
 
 ---
 kind: pipeline