diff --git a/.drone.yml b/.drone.yml
index cec316d..d7b2c6a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -47,8 +47,8 @@ platform:
   arch: amd64
 
 steps:
-- name: matrix
-  image: plugins/matrix
+- name: notification
+  image: thegeeklab/drone-matrix
   settings:
     homeserver:
       from_secret: matrix_homeserver
@@ -56,7 +56,7 @@ steps:
       from_secret: matrix_password
     roomid:
       from_secret: matrix_roomid
-    template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
+    template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
     username:
       from_secret: matrix_username
   when: