diff --git a/.drone.yml b/.drone.yml
index 6385fe95b..7aae0da50 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -115,7 +115,7 @@ pipeline:
     repo: laszlocloud/drone-oss-08-server
     dockerfile: Dockerfile.alpine
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8.100-alpine ]
+    tag: "${DRONE_TAG}-alpine"
     when:
       event: tag
 
@@ -124,7 +124,7 @@ pipeline:
     repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent.alpine
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8.100-alpine ]
+    tag: "${DRONE_TAG}-alpine"
     when:
       event: tag
 
@@ -132,7 +132,7 @@ pipeline:
     image: plugins/docker
     repo: laszlocloud/drone-oss-08-server
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8.100 ]
+    tag: ${DRONE_TAG}
     when:
       event: tag
 
@@ -141,7 +141,7 @@ pipeline:
     repo: laszlocloud/drone-oss-08-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
-    tag: [ 0.8.100 ]
+    tag: ${DRONE_TAG}
     when:
       event: tag