diff --git a/.drone.jsonnet b/.drone.jsonnet
index c7f58f9..4e00da4 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -133,11 +133,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: '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 }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },
diff --git a/.drone.yml b/.drone.yml
index d061f91..838f1cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,32 +7,32 @@ platform:
   arch: amd64
 
 steps:
-- name: ansible-later
-  image: thegeeklab/ansible-later
-  commands:
-  - ansible-later
+  - name: ansible-later
+    image: thegeeklab/ansible-later
+    commands:
+      - ansible-later
 
-- name: python-format
-  image: python:3.9
-  commands:
-  - pip install -qq yapf
-  - "[ -z \"$(find .  -type f -name *.py)\" ] || (yapf -rd ./)"
-  environment:
-    PY_COLORS: 1
+  - name: python-format
+    image: python:3.9
+    commands:
+      - pip install -qq yapf
+      - "[ -z \"$(find .  -type f -name *.py)\" ] || (yapf -rd ./)"
+    environment:
+      PY_COLORS: 1
 
-- name: python-flake8
-  image: python:3.9
-  commands:
-  - pip install -qq flake8
-  - flake8
-  environment:
-    PY_COLORS: 1
+  - name: python-flake8
+    image: python:3.9
+    commands:
+      - pip install -qq flake8
+      - flake8
+    environment:
+      PY_COLORS: 1
 
 trigger:
   ref:
-  - refs/heads/master
-  - refs/tags/**
-  - refs/pull/**
+    - refs/heads/master
+    - refs/tags/**
+    - refs/pull/**
 
 ---
 kind: pipeline
@@ -50,21 +50,21 @@ workspace:
   path: ${DRONE_REPO_NAME}
 
 steps:
-- name: ansible-molecule
-  image: thegeeklab/molecule:3
-  commands:
-  - molecule test -s centos7
-  environment:
-    HCLOUD_TOKEN:
-      from_secret: hcloud_token
+  - name: ansible-molecule
+    image: thegeeklab/molecule:3
+    commands:
+      - molecule test -s centos7
+    environment:
+      HCLOUD_TOKEN:
+        from_secret: hcloud_token
 
 trigger:
   ref:
-  - refs/heads/master
-  - refs/tags/**
+    - refs/heads/master
+    - refs/tags/**
 
 depends_on:
-- linting
+  - linting
 
 ---
 kind: pipeline
@@ -82,21 +82,21 @@ workspace:
   path: ${DRONE_REPO_NAME}
 
 steps:
-- name: ansible-molecule
-  image: thegeeklab/molecule:3
-  commands:
-  - molecule test -s centos8
-  environment:
-    HCLOUD_TOKEN:
-      from_secret: hcloud_token
+  - name: ansible-molecule
+    image: thegeeklab/molecule:3
+    commands:
+      - molecule test -s centos8
+    environment:
+      HCLOUD_TOKEN:
+        from_secret: hcloud_token
 
 trigger:
   ref:
-  - refs/heads/master
-  - refs/tags/**
+    - refs/heads/master
+    - refs/tags/**
 
 depends_on:
-- linting
+  - linting
 
 ---
 kind: pipeline
@@ -107,40 +107,40 @@ platform:
   arch: amd64
 
 steps:
-- name: generate
-  image: thegeeklab/ansible-doctor
-  environment:
-    ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
-    ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
-    ANSIBLE_DOCTOR_LOG_LEVEL: INFO
-    ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/
-    ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.}
-    ANSIBLE_DOCTOR_TEMPLATE: hugo-book
+  - name: generate
+    image: thegeeklab/ansible-doctor
+    environment:
+      ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/
+      ANSIBLE_DOCTOR_FORCE_OVERWRITE: true
+      ANSIBLE_DOCTOR_LOG_LEVEL: INFO
+      ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/
+      ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.}
+      ANSIBLE_DOCTOR_TEMPLATE: hugo-book
 
-- name: publish
-  image: plugins/gh-pages
-  settings:
-    netrc_machine: gitea.rknet.org
-    pages_directory: _docs/
-    password:
-      from_secret: gitea_token
-    remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}
-    target_branch: docs
-    username:
-      from_secret: gitea_username
-  when:
-    ref:
-    - refs/heads/master
+  - name: publish
+    image: plugins/gh-pages
+    settings:
+      netrc_machine: gitea.rknet.org
+      pages_directory: _docs/
+      password:
+        from_secret: gitea_token
+      remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}
+      target_branch: docs
+      username:
+        from_secret: gitea_username
+    when:
+      ref:
+        - refs/heads/master
 
 trigger:
   ref:
-  - refs/heads/master
-  - refs/tags/**
-  - refs/pull/**
+    - refs/heads/master
+    - refs/tags/**
+    - refs/pull/**
 
 depends_on:
-- testing-centos7
-- testing-centos8
+  - testing-centos7
+  - testing-centos8
 
 ---
 kind: pipeline
@@ -154,32 +154,32 @@ clone:
   disable: true
 
 steps:
-- name: matrix
-  image: plugins/matrix
-  settings:
-    homeserver:
-      from_secret: matrix_homeserver
-    password:
-      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 }}"
-    username:
-      from_secret: matrix_username
+  - name: matrix
+    image: thegeeklab/drone-matrix
+    settings:
+      homeserver:
+        from_secret: matrix_homeserver
+      password:
+        from_secret: matrix_password
+      roomid:
+        from_secret: matrix_roomid
+      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
+      username:
+        from_secret: matrix_username
 
 trigger:
   ref:
-  - refs/heads/master
-  - refs/tags/**
+    - refs/heads/master
+    - refs/tags/**
   status:
-  - success
-  - failure
+    - success
+    - failure
 
 depends_on:
-- documentation
+  - documentation
 
 ---
 kind: signature
-hmac: 3f564bbc6d9226ac63161b4dfccd3814c2b74e1ba0bcd01e19e2e788436a8763
+hmac: 1faa1e56e1790b1ac35110d8becd2e9597e3a9feb96cfa1738192f88c3488605
 
 ...