diff --git a/.drone.yml b/.drone.yml
index c3bf323..a81434f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,6 +39,26 @@ steps:
           - pull_request
           - tag
 
+  - name: docker_build_and_push_dockerhub
+    image: thegeeklab/drone-docker-buildx:23
+    privileged: true
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/mdns-repeater-mikrotik
+      tags:
+        - ${DRONE_COMMIT_SHA:0:8}
+        - ${DRONE_COMMIT_BRANCH}
+        - latest
+    when:
+      event:
+        exclude:
+          - pull_request
+          - tag
+
   - name: docker_build_and_push_selfhosted_tag
     image: thegeeklab/drone-docker-buildx:23
     privileged: true
@@ -51,3 +71,19 @@ steps:
     when:
       event:
         - tag
+
+  - name: docker_build_and_push_dockerhub_tag
+    image: thegeeklab/drone-docker-buildx:23
+    privileged: true
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/mdns-repeater-mikrotik
+      tags:
+        - ${DRONE_TAG}
+    when:
+      event:
+        - tag