diff --git a/.drone.yml b/.drone.yml
index 9fda75d..a3294a3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,26 +3,26 @@ kind: pipeline
 type: docker
 name: default
 steps:
-  # prüfe ob secrets im Repo sind
   - name: run gitleaks
     image: plugins/gitleaks
     settings:
       path: .
+    when:
+      event:
+        exclude:
+          - tag
 
-  # linter für Dockerfiles
-  # https://github.com/hadolint/hadolint/blob/master/docs/INTEGRATION.md
   - name: hadolint
     image: hadolint/hadolint:latest-debian
-    # image: ghcr.io/hadolint/hadolint:latest-debian
     commands:
       - hadolint --version
       - hadolint  Dockerfile
 
-  - name: docker_build_and_push
+  - name: docker_build_and_push_selfhosted
     image: plugins/docker
     settings:
       dockerfile: Dockerfile
-      repo: registry.mgrote.net/munin-server
+      repo: registry.mgrote.net/python-api-server
       registry: registry.mgrote.net
       tags:
         - ${DRONE_COMMIT_SHA:0:8}
@@ -32,3 +32,52 @@ steps:
       event:
         exclude:
           - pull_request
+          - tag
+
+
+  - name: docker_build_and_push_dockerhub
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/python-api-server
+      tags:
+        - ${DRONE_COMMIT_SHA:0:8}
+        - ${DRONE_COMMIT_BRANCH}
+        - latest
+    when:
+      event:
+        exclude:
+          - pull_request
+          - tag
+
+
+  - name: docker_build_and_push_selfhosted_tag
+    image: plugins/docker
+    settings:
+      dockerfile: Dockerfile
+      repo: registry.mgrote.net/python-api-server
+      registry: registry.mgrote.net
+      tags:
+        - ${DRONE_TAG}
+    when:
+      event:
+        - tag
+
+  - name: docker_build_and_push_dockerhub_tag
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/python-api-server
+      tags:
+        - ${DRONE_TAG}
+    when:
+      event:
+        - tag