diff --git a/.drone.jsonnet b/.drone.jsonnet
index 7aa80e5..8ca14d6 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -35,10 +35,14 @@ local PipelineBuild(os='linux', arch='amd64', version='gce') = {
         password: { from_secret: "docker_password" },
       },
       when: {
-        branch: [ "master" ],
+        ref: [
+          'refs/heads/master',
+          'refs/tags/**',
+        ],
       },
     },
   ],
+  depends_on: [ "clone" ],
 };
 
 local PipelineNotifications(depends_on=[]) = {
@@ -60,7 +64,11 @@ local PipelineNotifications(depends_on=[]) = {
         spec: "docker/manifest.tmpl",
       },
       when: {
-        branch: [ "master" ],
+        ref: [
+          'refs/heads/master',
+          'refs/tags/**',
+        ],
+        status: [ "success" ],
       },
     },
     {
@@ -80,6 +88,7 @@ local PipelineNotifications(depends_on=[]) = {
           'refs/heads/master',
           'refs/tags/**',
         ],
+        status: [ "success" ],
       },
     },
     {
@@ -89,10 +98,17 @@ local PipelineNotifications(depends_on=[]) = {
       settings: {
         urls: { from_secret: "microbadger_url" },
       },
+      when: {
+        status: [ "success" ],
+        ref: [
+          'refs/heads/master',
+          'refs/tags/**',
+        ],
+      },
     },
     {
-      image: "plugins/matrix",
       name: "matrix",
+      image: "plugins/matrix",
       pull: 'always',
       settings: {
         homeserver: "https://matrix.rknet.org",
@@ -103,6 +119,10 @@ local PipelineNotifications(depends_on=[]) = {
       },
       when: {
         status: [ "success", "failure" ],
+        ref: [
+          'refs/heads/master',
+          'refs/tags/**',
+        ],
       },
     },
   ],
diff --git a/.drone.yml b/.drone.yml
index 0c214c6..f7361f4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,8 +33,12 @@ steps:
     username:
       from_secret: docker_username
   when:
-    branch:
-    - master
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+- clone
 
 ---
 kind: pipeline
@@ -71,8 +75,12 @@ steps:
     username:
       from_secret: docker_username
   when:
-    branch:
-    - master
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+- clone
 
 ---
 kind: pipeline
@@ -109,8 +117,12 @@ steps:
     username:
       from_secret: docker_username
   when:
-    branch:
-    - master
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+- clone
 
 ---
 kind: pipeline
@@ -147,8 +159,12 @@ steps:
     username:
       from_secret: docker_username
   when:
-    branch:
-    - master
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+- clone
 
 ---
 kind: pipeline
@@ -170,8 +186,11 @@ steps:
     username:
       from_secret: docker_username
   when:
-    branch:
-    - master
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+    status:
+    - success
 
 - name: readme
   pull: always
@@ -189,6 +208,8 @@ steps:
     ref:
     - refs/heads/master
     - "refs/tags/**"
+    status:
+    - success
 
 - name: microbadger
   pull: always
@@ -196,6 +217,12 @@ steps:
   settings:
     urls:
       from_secret: microbadger_url
+  when:
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
+    status:
+    - success
 
 - name: matrix
   pull: always
@@ -209,6 +236,9 @@ steps:
     username:
       from_secret: matrix_username
   when:
+    ref:
+    - refs/heads/master
+    - "refs/tags/**"
     status:
     - success
     - failure
@@ -226,6 +256,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 0cdd1dbbed1db339ede0ce51c67f0757d906ce43a5fcf0dc7df60009d79334e1
+hmac: 02f0b54951a4006be604f729f1eb474bec81a2cde701cee18a82e341af10f83f
 
 ...