diff --git a/.drone.yml b/.drone.yml
index 4a7960a..c083566 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,77 +1,43 @@
 kind: pipeline
+type: docker
 name: default
 
 steps:
-  - name: build-alpine
-    image: plugins/docker:linux-amd64
-    pull: always
-    settings:
-      dockerfile: Dockerfile-alpine
-      daemon_off: false
-      dry_run: true
-      repo: docker.asperti.com/paspo/angry-squid
-      tags:
-        - latest
-        - alpine-latest
-    when:
-      event:
-        exclude:
-        - tag
-
-  - name: build-debian
-    image: plugins/docker:linux-amd64
-    pull: always
-    settings:
-      dockerfile: Dockerfile-debian
-      daemon_off: false
-      dry_run: true
-      repo: docker.asperti.com/paspo/angry-squid
-      tags:
-        - debian-latest
-    when:
-      event:
-        exclude:
-        - tag
-        
   - name: build_and_publish-alpine
     image: plugins/docker:linux-amd64
-    pull: always
     settings:
-      dockerfile: Dockerfile-alpine
-      auto_tag: true
-      auto_tag_suffix: alpine
-      force_tag: true
-      daemon_off: false
+      username:
+        from_secret: docker_username
       password:
         from_secret: docker_password
+      dockerfile: Dockerfile-alpine
       registry: docker.asperti.com
       repo: docker.asperti.com/paspo/angry-squid
       tags:
         - latest
         - alpine-latest
-      username:
-        from_secret: docker_username
-    when:
-      event:
-      - tag
+        - ${DRONE_TAG}
+        - alpine-${DRONE_TAG}
+        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+        - alpine-${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+      force_tag: true
 
   - name: build_and_publish-debian
     image: plugins/docker:linux-amd64
-    pull: always
     settings:
-      dockerfile: Dockerfile-debian
-      auto_tag: true
-      auto_tag_suffix: debian
-      force_tag: true
-      daemon_off: false
+      username:
+        from_secret: docker_username
       password:
         from_secret: docker_password
+      dockerfile: Dockerfile-debian
       registry: docker.asperti.com
       repo: docker.asperti.com/paspo/angry-squid
       tags:
         - debian-latest
-      username:
-        from_secret: docker_username
-    when:
-      event:
-      - tag
\ No newline at end of file
+        - debian-${DRONE_TAG}
+        - debian-${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+      force_tag: true
+
+trigger:
+  event:
+    - tag