diff --git a/.drone.yml b/.drone.yml
index 9d54c7f..cbf5734 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,7 @@ steps:
       - hadolint --version
       - hadolint  Dockerfile
 
-  - name: docker_build_and_push
+  - name: docker_build_and_push_master
     image: plugins/docker
     settings:
       username:
@@ -33,3 +33,20 @@ steps:
       event:
         exclude:
           - pull_request
+
+  - name: docker_build_and_push
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKERHUB_USER
+      password:
+        from_secret: DOCKERHUB_PASS
+      dockerfile: Dockerfile
+      repo: quotengrote/fpm
+      tags:
+        - ${DRONE_COMMIT_SHA:0:8}
+        - ${DRONE_COMMIT_BRANCH}
+    when:
+      event:
+        exclude:
+          - pull_request