diff --git a/.drone.yml b/.drone.yml
index b42260a..4a66924 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,6 +9,7 @@ name: default
 steps:
 - name: reuse
   image: fsfe/reuse:latest
+
 - name: docker-publish
   image: plugins/docker
   settings:
@@ -21,5 +22,22 @@ steps:
     password:
       from_secret: "docker_password"
   when:
+    event:
+      - push
     branch:
       - main
+
+- name: docker-publish-tag
+  image: plugins/docker
+  settings:
+    registry: registry.wtf-eg.net
+    repo: registry.wtf-eg.net/ki-frontend
+    target: ki-frontend
+    auto_tag: true
+    username:
+      from_secret: "docker_username"
+    password:
+      from_secret: "docker_password"
+  when:
+    event:
+      - tag