diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
index f37034d..cd24010 100644
--- a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
+++ b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
@@ -136,7 +136,7 @@ local PipelineNotification = {
       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 {{ commit.Author }}<br/> Message: {{ commit.Message }}{% endraw %}',
+        template: '{% raw %}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 }}{% endraw %}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },