diff --git a/ci-scripts/cls_module.py b/ci-scripts/cls_module.py
index 17d45828c8..a82e2050b9 100644
--- a/ci-scripts/cls_module.py
+++ b/ci-scripts/cls_module.py
@@ -111,11 +111,10 @@ class Module_UE:
 			return self._collectTrace(ctx)
 		return None
 
-	def attach(self, attach_tries = 3, attach_timeout = 0):
+	def attach(self, attach_tries = 3, attach_timeout = 40):
 		ip = None
 		while attach_tries > 0:
 			self._command(self.cmd_dict["attach"])
-			attach_timeout += 20
 			timeout = attach_timeout
 			logging.debug("Waiting for IP address to be assigned")
 			ip = self.getIP(silent=False, reportNonZero=True)
@@ -126,6 +125,7 @@ class Module_UE:
 			if ip:
 				break
 			logging.warning(f"UE did not receive IP address after {attach_timeout} s, detaching")
+			attach_timeout += 20
 			attach_tries -= 1
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)