diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 463c94b..bf2924d 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -29,8 +29,8 @@ else
     # socat will make the conn appear to come from 127.0.0.1
     # ProtonMail Bridge currently expects that.
     # It also allows us to bind to the real ports :)
-    socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
-    socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
+    socat TCP-LISTEN:25,fork,reuseaddr TCP:127.0.0.1:1025,nodelay &
+    socat TCP-LISTEN:143,fork,reuseaddr TCP:127.0.0.1:1143,nodelay &
 
     # Start protonmail
     # Fake a terminal, so it does not quit because of EOF...
diff --git a/deb/entrypoint.sh b/deb/entrypoint.sh
index 94c9f77..764ad0a 100644
--- a/deb/entrypoint.sh
+++ b/deb/entrypoint.sh
@@ -43,8 +43,8 @@ else
     # socat will make the conn appear to come from 127.0.0.1
     # ProtonMail Bridge currently expects that.
     # It also allows us to bind to the real ports :)
-    socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
-    socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
+    socat TCP-LISTEN:25,fork,reuseaddr TCP:127.0.0.1:1025,nodelay &
+    socat TCP-LISTEN:143,fork,reuseaddr TCP:127.0.0.1:1143,nodelay &
 
     # Start protonmail
     # Fake a terminal, so it does not quit because of EOF...