diff --git a/mini-pc/maddy/maddy.conf b/mini-pc/maddy/maddy.conf
index 132f308..dd3e272 100644
--- a/mini-pc/maddy/maddy.conf
+++ b/mini-pc/maddy/maddy.conf
@@ -3,6 +3,20 @@ state_dir /data
 runtime_dir /run/maddy
 tls off
 
+target.smtp yandex_smtp {
+    debug yes
+    targets {env:RELAY_SMTP_TARGET}
+    auth plain {env:RELAY_SMTP_USERNAME} {env:RELAY_SMTP_PASSWORD}
+    starttls no
+}
+
+target.queue outbound_queue {
+    target yandex_smtp
+    location outbound_queue
+    max_tries 4
+    debug yes
+}
+
 smtp tcp://0.0.0.0:2525 {
     hostname {env:MADDY_HOSTNAME}
     dmarc no
@@ -12,11 +26,7 @@ smtp tcp://0.0.0.0:2525 {
 
     source {env:RELAY_ALLOWED_FROM} {
         default_destination {
-            deliver_to smtp {env:RELAY_SMTP_TARGET} {
-                debug yes
-                auth plain {env:RELAY_SMTP_USERNAME} {env:RELAY_SMTP_PASSWORD}
-                starttls no
-            }
+            deliver_to &outbound_queue
         }
     }