diff --git a/.drone.yml b/.drone.yml
index bf2d50a..80d6c4a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,3 +28,48 @@ steps:
       event:
         exclude:
           - pull_request
+
+  - 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
+
+  - 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