diff --git a/.drone.yml b/.drone.yml
index 4398364..179270f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,8 +32,8 @@ steps:
     settings:
       dockerfile: Dockerfile
       dry_run: true
-      repo: thegeeklab/${DRONE_REPO_NAME}
       provenance: false
+      repo: thegeeklab/${DRONE_REPO_NAME}
     when:
       ref:
         - refs/pull/**
@@ -74,10 +74,10 @@ steps:
       dockerfile: Dockerfile
       password:
         from_secret: docker_password
+      provenance: false
       repo: thegeeklab/${DRONE_REPO_NAME}
       username:
         from_secret: docker_username
-      provenance: false
     when:
       ref:
         - refs/heads/main
@@ -91,11 +91,11 @@ steps:
       dockerfile: Dockerfile
       password:
         from_secret: quay_password
+      provenance: false
       registry: quay.io
       repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
       username:
         from_secret: quay_username
-      provenance: false
     when:
       ref:
         - refs/heads/main
@@ -171,7 +171,7 @@ steps:
         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 }}"
+      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:
@@ -192,6 +192,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: a22456d21d7d9fe4602cbf1e9e8c3fb4760471860bd69f64f13b0c06e8af6d1c
+hmac: 3f3eb5b5948b685e6a966accf5b229167001c597dea124b8f85406ce46f1d701
 
 ...