diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5036b0e..18765d0 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,5 +1,5 @@
 steps:
-  - name: telegram_start_notify
+  - name: telegram start notify
     image: appleboy/drone-telegram
     settings:
       token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM
@@ -11,12 +11,12 @@ steps:
         *Repo Link:* ${CI_REPO_URL}
         *Branch:* ${CI_COMMIT_BRANCH}
 
-        *Build Status:* starting
+        *Build Status:* *starting*
         *Build Link:* ${CI_PIPELINE_URL}
 
         *Commit ID:* `${CI_COMMIT_SHA:0:8}`
-        *Commit By:* ${CI_PREV_COMMIT_AUTHOR}
-        *Commit Link:* ${CI_PREV_COMMIT_URL}
+        *Commit By:* {{commit.author}}
+        *Commit Link:* {{commit.link}}
         *Commit Msg:* {{commit.message}}
         🙏 hopefully success Mas Bro.
     when:
@@ -59,7 +59,7 @@ steps:
       branch:
         - master
 
-  - name: telegram_end_notify
+  - name: telegram failed notify
     image: appleboy/drone-telegram
     settings:
       token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM
@@ -71,18 +71,43 @@ steps:
         *Repo Link:* ${CI_REPO_URL}
         *Branch:* ${CI_COMMIT_BRANCH}
 
-        *Build Status:* *${CI_PREV_PIPELINE_STATUS}*
+        *Build Status:* *Failed*
         *Build Link:* ${CI_PIPELINE_URL}
 
         *Commit ID:* `${CI_COMMIT_SHA:0:8}`
-        *Commit By:* ${CI_PREV_COMMIT_AUTHOR}
-        *Commit Link:* ${CI_PREV_COMMIT_URL}
+        *Commit By:* {{commit.author}}
+        *Commit Link:* {{commit.link}}
         *Commit Msg:* {{commit.message}}
-        {{#success build.status}}
-        😎 build succeeded. Good job.
-        {{else}}
         🙈 build failed. Fix me please, before client is aware.
-        {{/success}}
     when:
+      status:
+        - failure
+        - cancel
+      branch:
+        - master
+
+  - name: telegram success notify
+    image: appleboy/drone-telegram
+    settings:
+      token: 7616010754:AAGXMf8x-roKozdT0j-bOZ1y9dmbulbKPbM
+      to: -4765409490
+      message: |
+        🚀 *Woodpecker CI Build Finish* 🚀
+
+        *Repo:* ${CI_REPO_OWNER}/${CI_REPO_NAME}
+        *Repo Link:* ${CI_REPO_URL}
+        *Branch:* ${CI_COMMIT_BRANCH}
+
+        *Build Status:* *Success*
+        *Build Link:* ${CI_PIPELINE_URL}
+
+        *Commit ID:* `${CI_COMMIT_SHA:0:8}`
+        *Commit By:* {{commit.author}}
+        *Commit Link:* {{commit.link}}
+        *Commit Msg:* {{commit.message}}
+        😎 build succeeded. Good job.
+    when:
+      status:
+        - success
       branch:
         - master