diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 946f70f87..748ec60c9 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -405,6 +405,12 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
                 address = host + ":" + iPort;
                 output.accept(Message.buildStatus("Daemon listening for debugger on address: " + address));
                 args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + address);
+                if (Environment.MVND_KEEP_ALIVE.getCommandLineOption(args) == null) {
+                    System.setProperty(Environment.MVND_KEEP_ALIVE.getProperty(), "1h");
+                }
+                if (Environment.MVND_CONNECT_TIMEOUT.getCommandLineOption(args) == null) {
+                    System.setProperty(Environment.MVND_CONNECT_TIMEOUT.getProperty(), "1h");
+                }
             }
             // jvm args
             String jvmArgs = parameters.jvmArgs();