diff --git a/.drone.jsonnet b/.drone.jsonnet
index c88c295..064944e 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -209,7 +209,7 @@ local PipelineNotifications = {
       pull: "always",
       settings: {
         ignore_missing: true,
-        auto_tag: true,
+        tags: ["${DRONE_TAG}", "${DRONE_TAG%-*}", "${DRONE_TAG%.*}", "${DRONE_TAG%%.*}"],
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         spec: "manifest.tmpl",
diff --git a/.drone.yml b/.drone.yml
index 7187397..3c6df2f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -138,20 +138,6 @@ steps:
   commands:
   - "cd dist/ && sha256sum * > sha256sum.txt"
 
-- name: publish-pypi
-  pull: always
-  image: plugins/pypi
-  settings:
-    password:
-      from_secret: pypi_password
-    repository: https://upload.pypi.org/legacy/
-    skip_build: true
-    username:
-      from_secret: pypi_username
-  when:
-    ref:
-    - "refs/tags/**"
-
 - name: publish-github
   pull: always
   image: plugins/github-release
@@ -349,11 +335,15 @@ steps:
   pull: always
   image: plugins/manifest
   settings:
-    auto_tag: true
     ignore_missing: true
     password:
       from_secret: docker_password
     spec: manifest.tmpl
+    tags:
+    - "${DRONE_TAG}"
+    - "${DRONE_TAG%-*}"
+    - "${DRONE_TAG%.*}"
+    - "${DRONE_TAG%%.*}"
     username:
       from_secret: docker_username
   when:
@@ -413,6 +403,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: c058f002db91849e25873dfd440bb27949e6bb0de7087ceada91ba7fedcb93c2
+hmac: 8e2fd7a3c62cabf6824d72b6aee4d486b4a7a8234e43ae8629510c3334c4626f
 
 ...
diff --git a/README.md b/README.md
index 1ace504..46be30f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 # ansible-doctor
 
 [![Build Status](https://cloud.drone.io/api/badges/xoxys/ansible-doctor/status.svg)](https://cloud.drone.io/xoxys/ansible-doctor)
+[![](https://images.microbadger.com/badges/image/xoxys/ansible-doctor.svg)](https://microbadger.com/images/xoxys/ansible-doctor "Get your own image badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/xoxys/ansible-doctor.svg)](https://microbadger.com/images/xoxys/ansible-doctor "Get your own version badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/xoxys/ansible-doctor:amd64.svg)](https://microbadger.com/images/xoxys/ansible-doctor:amd64 "Get your own version badge on microbadger.com")
+[![](https://images.microbadger.com/badges/version/xoxys/ansible-doctor:arm.svg)](https://microbadger.com/images/xoxys/ansible-doctor:arm "Get your own version badge on microbadger.com")
 ![License](https://img.shields.io/github/license/xoxys/ansible-doctor)
diff --git a/manifest.tmpl b/manifest.tmpl
index c674c76..6c3a9fe 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -2,7 +2,7 @@ image: xoxys/ansible-doctor:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
-  - {{ this }}
+  - {{trimPrefix "v" this}}
 {{/each}}
 {{/if}}
 manifests: