diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 1a575e0..e28cfcc 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -26,13 +26,12 @@ steps:
     image: deblan/woodpecker-email
     settings:
       debug: yes
-      dsn: "smtp://username:password@mail.example.com:587?verify_peer=1"
+      dsn: "gmail+smtp://username:password@default?verify_peer=1"
       from:
         address:
           - from_secret: SMTP_SELFHOSTED_FROM_EMAIL
         name:
           - from_secret: SMTP_EMAIL_NAME
-      evaluate: 'commit.branch == "master"'
       recipients:
         - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1
       level: info
@@ -46,6 +45,7 @@ steps:
       attachments:
         - log/*
     when:
+      - branch: master
       - status: [success, failure]
 
 when:
diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml
index 9fedb92..d9d49d4 100644
--- a/.woodpecker/.deploy.yml
+++ b/.woodpecker/.deploy.yml
@@ -17,13 +17,12 @@ steps:
     image: deblan/woodpecker-email
     settings:
       debug: yes
-      dsn: "smtp://username:password@mail.example.com:587?verify_peer=1"
+      dsn: "gmail+smtp://username:password@default?verify_peer=1"
       from:
         address:
           - from_secret: SMTP_SELFHOSTED_FROM_EMAIL
         name:
           - from_secret: SMTP_EMAIL_NAME
-      evaluate: 'commit.branch == "master"'
       recipients:
         - from_secret: SMTP_SELFHOSTED_EMAIL_TO_1
       level: success
@@ -37,6 +36,7 @@ steps:
       attachments:
         - log/*
     when:
+      - branch: master
       - status: [success, failure]
 
 when: