diff --git a/.drone.yml b/.drone.yml
index a22254ed6..55acdb28e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,7 +43,8 @@ trigger:
   - cron
 
 ---
-type: pipeline
+kind: pipeline
+type: docker
 name: notify_success
 
 clone:
@@ -52,18 +53,7 @@ clone:
 steps:
 - name: notify_success
   pull: if-not-exists
-  image: leophys/mailer:0.1
-  commands: |
-    cat << EOM \| /sendmail \
-    -server-address=${M_SERVER_ADDRESS} \
-    -server-port=465 \
-    -user=${M_USER} \
-    -password=${M_PASSWORD} \
-    -from=${M_FROM} \
-    -to=${M_TO} \
-    -sub="[fenix|SUCCESS] $(date +%Y-%m-%d_%H:%M)" \
-    Success building fenix \
-    EOM
+  image: leophys/mailer:0.2
   environment:
     M_SERVER_ADDRESS:
       from_secret: m_server_address
@@ -75,6 +65,8 @@ steps:
       from_secret: m_from
     M_TO:
       from_secret: m_to
+    M_SUB: "[fenix] SUCCESS"
+    M_TEXT: "Success building fenix"
 
 trigger:
   status:
@@ -84,7 +76,8 @@ depends_on:
   - default
 
 ---
-type: pipeline
+kind: pipeline
+type: docker
 name: notify_failure
 
 clone:
@@ -93,18 +86,7 @@ clone:
 steps:
 - name: notify_failure
   pull: if-not-exists
-  image: leophys/mailer:0.1
-  commands: |
-    cat << EOM \| /sendmail \
-    -server-address=${M_SERVER_ADDRESS} \
-    -server-port=465 \
-    -user=${M_USER} \
-    -password=${M_PASSWORD} \
-    -from=${M_FROM} \
-    -to=${M_TO} \
-    -sub="[fenix|FAIL] $(date +%Y-%m-%d_%H:%M)" \
-    Failed building fenix \
-    EOM
+  image: leophys/mailer:0.2
   environment:
     M_SERVER_ADDRESS:
       from_secret: m_server_address
@@ -116,6 +98,8 @@ steps:
       from_secret: m_from
     M_TO:
       from_secret: m_to
+    M_SUB: "[fenix] FAILURE"
+    M_TEXT: "Failed building fenix"
 
 trigger:
   status:
@@ -126,6 +110,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 58b7d3379af2812381ff21ab4db11726731e1aa0f9e330c13cc2c4fd9ac10d5a
+hmac: 91758e9f74e839c409e13a1dd7512dec92b18e1b9430b78770a81cf1c05e217d
 
 ...