diff --git a/.drone.jsonnet b/.drone.jsonnet
index d1841dd..355b585 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -21,7 +21,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         build_args: {
-          KANBOARD_VERSION: "${DRONE_TAG%.*}",
+          KANBOARD_VERSION: "${DRONE_TAG%??}",
         },
       },
     },
@@ -37,7 +37,7 @@ local PipelineBuild(os='linux', arch='amd64') = {
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         build_args: {
-          KANBOARD_VERSION: "${DRONE_TAG%.*}",
+          KANBOARD_VERSION: "${DRONE_TAG%??}",
         },
       },
       when: {
@@ -65,6 +65,7 @@ local PipelineNotifications(depends_on=[]) = {
       settings: {
         auto_tag: true,
         ignore_missing: true,
+        tags: ["${DRONE_TAG%??}"],
         username: { from_secret: "docker_username" },
         password: { from_secret: "docker_password" },
         spec: "./manifest.tmpl",
diff --git a/.drone.yml b/.drone.yml
index 8d7eebc..d090992 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,8 +28,6 @@ steps:
   settings:
     auto_tag: true
     auto_tag_suffix: linux-amd64
-    tags:
-      - '9.1.2'
     build_args:
       KANBOARD_VERSION: "${DRONE_TAG%??}"
     dockerfile: ./Dockerfile.linux.amd64
@@ -58,13 +56,11 @@ steps:
   settings:
     auto_tag: true
     ignore_missing: true
-    tags:
-      - '1.2.3'
-      - 1.2.3
-      - "1.2.3"
     password:
       from_secret: docker_password
     spec: ./manifest.tmpl
+    tags:
+    - "${DRONE_TAG%??}"
     username:
       from_secret: docker_username
   when:
@@ -122,6 +118,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: b4886bd41987f4b8359cece32871027bef1fb09577998d2d8dd8f5d455b75e15
+hmac: 61face46ad11c158afa2b27ebad7521167c6229d11c7490c06944daeb5b10f70
 
 ...