diff --git a/.drone.star b/.drone.star
index 526a11c..fa5aab9 100644
--- a/.drone.star
+++ b/.drone.star
@@ -6,15 +6,58 @@ def main(ctx):
         stepMergeMaster("arm64", "motsognir"),
         stepBuildWeekly("amd64", "motsognir"),
         stepBuildWeekly("arm64", "motsognir"),
-
+        
         stepPR("amd64", "webtest"),
         stepPR("arm64", "webtest"),
         stepMergeMaster("amd64", "webtest"),
         stepMergeMaster("arm64", "webtest"),
         stepBuildWeekly("amd64", "webtest"),
         stepBuildWeekly("arm64", "webtest"),
+        
+        notify(ctx),
     ]
 
+def notify(ctx):
+  return {
+        "kind": "pipeline",
+        "type": "docker",
+        "name": "matrix-notifications",
+        "clone": {
+            "disable": True,
+        },
+        "steps": [
+          {
+              "name": "notify",
+              "image": "plugins/matrix",
+              "settings": {
+                "homeserver": {
+                  "from_secret": "matrix-homeserver"
+                },
+                "roomid": {
+                  "from_secret": "matrix-room"
+                },
+                "username": {
+                  "from_secret": "matrix-user"
+                },
+                "password": {
+                  "from_secret": "matrix-password"
+                }
+              }
+            },
+        ],
+        "depends_on": [],
+        "trigger": {
+            "ref": [
+                "refs/heads/master",
+                "refs/heads/release*",
+                "refs/tags/**",
+            ],
+            "status": [
+                "failure",
+                "success",
+            ],
+        },
+      }
 
 def stepPR(arch, path):
     return {
@@ -36,25 +79,8 @@ def stepPR(arch, path):
                     "tag": "latest-%s" % (arch),
                 }
             },
-            {
-              "name": "notify-build-%s-%s" % (path, arch),
-              "image": "plugins/matrix",
-              "settings": {
-                "homeserver": {
-                  "from_secret": "matrix-homeserver"
-                },
-                "roomid": {
-                  "from_secret": "matrix-room"
-                },
-                "username": {
-                  "from_secret": "matrix-user"
-                },
-                "password": {
-                  "from_secret": "matrix-password"
-                }
-              }
-            },
         ],
+        "depends_on": ["matrix-notifications"],
         "trigger": {
             "ref": [
                 "refs/pull/**",
@@ -92,25 +118,8 @@ def stepMergeMaster(arch, path):
                     }
                 }
             },
-            {
-              "name": "notify-publish-%s-%s" % (path, arch),
-              "image": "plugins/matrix",
-              "settings": {
-                "homeserver": {
-                  "from_secret": "matrix-homeserver"
-                },
-                "roomid": {
-                  "from_secret": "matrix-room"
-                },
-                "username": {
-                  "from_secret": "matrix-user"
-                },
-                "password": {
-                  "from_secret": "matrix-password"
-                }
-              }
-            },
         ],
+        "depends_on": [],
         "trigger": {
             "ref": [
                 "refs/heads/master",
@@ -148,25 +157,8 @@ def stepBuildWeekly(arch, path):
                     }
                 }
             },
-            {
-              "name": "notify-publish-%s-%s" % (path, arch),
-              "image": "plugins/matrix",
-              "settings": {
-                "homeserver": {
-                  "from_secret": "matrix-homeserver"
-                },
-                "roomid": {
-                  "from_secret": "matrix-room"
-                },
-                "username": {
-                  "from_secret": "matrix-user"
-                },
-                "password": {
-                  "from_secret": "matrix-password"
-                }
-              }
-            },
         ],
+        "depends_on": [],
         "trigger": {
             "ref": [
                 "refs/heads/master",