diff --git a/.drone.yml b/.drone.yml
index 59e1ffe..579cce2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,34 +3,35 @@ kind: pipeline
 type: docker
 name: default
 
-environment:
-  DOCKERHUB_USERNAME:
-    from_secret: DOCKERHUB_USERNAME
-  DOCKERHUB_PASSWORD:
-    from_secret: DOCKERHUB_PASSWORD
+#environment:
+# DOCKER_REPO: glenux/service-ntfy
 
 steps:
   - name: docker
     image: plugins/docker
     pull: never
     settings:
-      username: "$${DOCKERHUB_USERNAME}"
-      password: "$${DOCKERHUB_PASSWORD}"
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
       repo: glenux/service-ntfy
       tags: "${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:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      repo: glenux/service-ntfy
+      tags: "latest_${DRONE_BRANCH//\//}"
+    when:
+      branch:
+        - master
+        - develop
+        - feature/*
 
       # - name: docker
       #   image: plugins/docker