diff --git a/.drone.yml b/.drone.yml
index d1a4e05..80d32f2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,14 +1,44 @@
 ---
 kind: pipeline
+ype: docker
 name: default
 
+environment:
+  DOCKERHUB_USERNAME:
+    from_secret: DOCKERHUB_USERNAME
+  DOCKERHUB_PASSWORD:
+    from_secret: DOCKERHUB_PASSWORD
+
 steps:
   - name: docker
     image: plugins/docker
     settings:
-      username: kevinbacon
-      password: pa55word
-      repo: foo/bar
-      tags: latest
+      username: ${DOCKERHUB_USERNAME}
+      password: ${DOCKERHUB_PASSWORD}
+      repo: glenux/service-ntfy
+      tags: ${DRONE_BRANCH//\//-}-${DRONE_COMMIT_SHA:0:8}
 
+  - name: docker
+    image: plugins/docker
+    settings:
+      username: ${DOCKERHUB_USERNAME}
+      password: ${DOCKERHUB_PASSWORD}
+      repo: glenux/service-ntfy
+      tags: latest_${DRONE_BRANCH}
+    when:
+      branch:
+        - master
+        - develop
+        - feature/*
+
+  - name: docker
+    image: plugins/docker
+    settings:
+      username: ${DOCKERHUB_USERNAME}
+      password: ${DOCKERHUB_PASSWORD}
+      repo: glenux/service-ntfy
+      tags: latest
+    when:
+      branch:
+        - master
 #