diff --git a/broker/hosts.py b/broker/hosts.py
index bdaf3ecf..bf26ec93 100644
--- a/broker/hosts.py
+++ b/broker/hosts.py
@@ -68,6 +68,7 @@ def connect(
             password=password,
             port=_port,
             key_filename=key_filename,
+            timeout=timeout
         )
 
     def close(self):
diff --git a/broker/session.py b/broker/session.py
index e3552dc4..2e50100a 100644
--- a/broker/session.py
+++ b/broker/session.py
@@ -31,7 +31,8 @@ def __init__(self, **kwargs):
         sock.settimeout(kwargs.get("timeout"))
         port = kwargs.get("port", 22)
         key_filename = kwargs.get("key_filename")
-        helpers.simple_retry(sock.connect, [(host, port)])
+        timeout = kwargs.get("timeout", 60)
+        helpers.simple_retry(sock.connect, [(host, port)], max_timeout=timeout)
         self.session = ssh2_Session()
         self.session.handshake(sock)
         if key_filename: