diff --git a/.drone.yml b/.drone.yml
index 4f8b676..5c90070 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-name: linux-amd64
+name: build-amd64
 
 platform:
   os: linux
@@ -8,29 +8,29 @@ platform:
 
 steps:
 - name: dryrun
-  pull: always
-  image: plugins/docker:linux-amd64
+  image: plugins/docker
   settings:
     build_args:
-      FRESHRSS_VERSION: "${DRONE_TAG%-*}"
-    dockerfile: ./Dockerfile.linux.amd64
+    - FRESHRSS_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
     dry_run: true
     password:
       from_secret: docker_password
     repo: xoxys/freshrss
-    tags: linux-amd64
     username:
       from_secret: docker_username
+  when:
+    ref:
+    - refs/pull/**
 
 - name: publish
-  pull: always
-  image: plugins/docker:linux-amd64
+  image: plugins/docker
   settings:
     auto_tag: true
-    auto_tag_suffix: linux-amd64
+    auto_tag_suffix: amd64
     build_args:
-      FRESHRSS_VERSION: "${DRONE_TAG%-*}"
-    dockerfile: ./Dockerfile.linux.amd64
+    - FRESHRSS_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
     password:
       from_secret: docker_password
     repo: xoxys/freshrss
@@ -39,10 +39,9 @@ steps:
   when:
     ref:
     - refs/heads/master
-    - "refs/tags/**"
+    - refs/tags/**
 
 - name: publish-gitea
-  pull: always
   image: plugins/gitea-release
   settings:
     api_key:
@@ -50,10 +49,10 @@ steps:
     base_url: https://gitea.rknet.org
     note: CHANGELOG.md
     overwrite: true
-    title: "${DRONE_TAG}"
+    title: ${DRONE_TAG}
   when:
     ref:
-    - "refs/tags/**"
+    - refs/tags/**
 
 ---
 kind: pipeline
@@ -65,27 +64,24 @@ platform:
 
 steps:
 - name: manifest
-  pull: always
   image: plugins/manifest
   settings:
     ignore_missing: true
     password:
       from_secret: docker_password
-    spec: ./manifest.tmpl
+    spec: manifest.tmpl
     tags:
-    - "${DRONE_TAG}"
-    - "${DRONE_TAG%-*}"
-    - "${DRONE_TAG%.*}"
-    - "${DRONE_TAG%%.*}"
+    - ${DRONE_TAG}
+    - ${DRONE_TAG%-*}
+    - ${DRONE_TAG%.*}
+    - ${DRONE_TAG%%.*}
     username:
       from_secret: docker_username
   when:
-    ref:
-    - refs/heads/master
-    - "refs/tags/**"
+    status:
+    - success
 
 - name: readme
-  pull: always
   image: sheogorath/readme-to-dockerhub
   environment:
     DOCKERHUB_PASSWORD:
@@ -97,25 +93,18 @@ steps:
     README_PATH: README.md
     SHORT_DESCRIPTION: Rootless FreshRSS - Self-hosted RSS feed aggregator
   when:
-    ref:
-    - refs/heads/master
-    - "refs/tags/**"
-
-- name: microbadger
-  pull: always
-  image: plugins/webhook
-  settings:
-    urls:
-      from_secret: microbadger_url
+    status:
+    - success
 
 - name: matrix
-  pull: always
   image: plugins/matrix
   settings:
-    homeserver: https://matrix.rknet.org
+    homeserver:
+      from_secret: matrix_homeserver
     password:
       from_secret: matrix_password
-    roomid: MtidqQXWWAtQcByBhH:rknet.org
+    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
@@ -125,15 +114,18 @@ steps:
     - failure
 
 trigger:
+  ref:
+  - refs/heads/master
+  - refs/tags/**
   status:
   - success
   - failure
 
 depends_on:
-- linux-amd64
+- build-amd64
 
 ---
 kind: signature
-hmac: bd995781ed16870c304a86ea3c0ab8e61f34f6539ab34e4c16750f0e677965a2
+hmac: 937a518f88c278f03efd7275457767212aeae51183cfa35751b5fb302a8c93dc
 
 ...