diff --git a/.drone.yml b/.drone.yml
index 11396c2..52e3b89 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 global-variables:
-  release: &release ${DRONE_BRANCH##**/}
+  release: &release ${DRONE_TAG}
   environment: &environment
     CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/frontend
     CRE_PORT: 9102
@@ -21,6 +21,9 @@ steps:
       - echo -n "latest" > .tags
     when:
       branch: develop
+      event:
+        exclude:
+          - pull_request
 
   - name: set-docker-tags-release
     image: *alpine-image
@@ -29,18 +32,30 @@ steps:
     commands:
       - echo -n "latest-release,$CRE_RELEASE" > .tags
     when:
-      branch: release/**
+      event:
+        - tag
 
-  - name: containerize
+  - name: containerize-dev
     image: plugins/docker
     environment:
       <<: *environment
     settings:
       repo: *docker-registry-repo
     when:
-      branch:
-        - develop
-        - release/**
+      branch: develop
+      event:
+        exclude:
+          - pull_request
+
+  - name: containerize-release
+    image: plugins/docker
+    environment:
+      <<: *environment
+    settings:
+      repo: *docker-registry-repo
+    when:
+      event:
+        - tag
 
   - name: deploy
     image: alpine:latest
@@ -70,10 +85,5 @@ steps:
       - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker pull $CRE_REGISTRY_IMAGE:$CRE_RELEASE"
       - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker run -d -p $CRE_PORT:80 --name=$DEPLOY_CONTAINER_NAME $CRE_REGISTRY_IMAGE:$CRE_RELEASE"
     when:
-      branch: release/**
-
-trigger:
-  branch:
-    - develop
-    - release/**
-    - master
+      event:
+        - tag