diff --git a/.drone.yml b/.drone.yml
index bc239be..f5be96a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,6 +11,8 @@ steps:
   - yarn install
   - yarn lint
   when:
+    event:
+    - push
     branch:
       exclude:
       - master
@@ -24,16 +26,9 @@ steps:
     repo: registry.git.tdem.in/amber_web
     registry: registry.git.tdem.in
     dockerfile: Dockerfile
+    tags:
+      - ${DRONE_TAG}
+      - latest
   when:
-    branch:
-      exclude:
-      - develop
-      - backend
-      - feature/*
-
-trigger:
-  event:
-  - push
-  - tag
-  - promote
-  - rollback
+    event:
+    - tag