diff --git a/.drone.yml b/.drone.yml
index e28c0d8..195138e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ type: docker
 name: build-docker-image
 
 steps:
-- name: docker
+- name: docker-latest
   image: plugins/docker
   settings:
     repo: madeorsk/clang-llvm-meson-buildtools
@@ -11,3 +11,19 @@ steps:
       from_secret: docker_registry_username
     password:
       from_secret: docker_registry_password
+  when:
+    branch:
+      - main
+
+- name: docker-tag
+  image: plugins/docker
+  settings:
+    repo: madeorsk/clang-llvm-meson-buildtools
+    tags: ${DRONE_TAG}
+    username:
+      from_secret: docker_registry_username
+    password:
+      from_secret: docker_registry_password
+  when:
+    ref:
+      - refs/tags/*