diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
index 6a8c8fa..f37034d 100644
--- a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
+++ b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
@@ -132,11 +132,11 @@ local PipelineNotification = {
   steps: [
     {
       name: 'matrix',
-      image: 'plugins/matrix',
+      image: 'thegeeklab/drone-matrix',
       settings: {
         homeserver: { from_secret: 'matrix_homeserver' },
         roomid: { from_secret: 'matrix_roomid' },
-        template: '{% raw %}Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}{% endraw %}',
+        template: '{% raw %}Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}) ({{ build.Branch }}) by {{ commit.Author }}<br/> Message: {{ commit.Message }}{% endraw %}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },