diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts
index 11e53b3e26..570fb6a0d4 100644
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts
+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/drivers/lambda.driver.ts
@@ -41,7 +41,6 @@ import { ASSET_PATH } from 'src/constants/assets-path';
 import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
 import { type CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';
 import { COMMON_LAYER_DEPENDENCIES_DIRNAME } from 'src/engine/core-modules/logic-function/logic-function-drivers/constants/common-layer-dependencies-dirname';
-import { callWithTimeout } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout';
 import { copyBuilder } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/copy-builder';
 import { copyCommonLayerDependencies } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/copy-common-layer-dependencies';
 import { copyExecutor } from 'src/engine/core-modules/logic-function/logic-function-drivers/utils/copy-executor';
@@ -429,17 +428,18 @@ export class LambdaDriver implements LogicFunctionDriver {
 
     const yarnInstallFunctionName = await this.getYarnInstallFunctionName();
 
-    const result = await callWithTimeout({
-      callback: () =>
-        lambdaClient.send(
-          new InvokeCommand({
-            FunctionName: yarnInstallFunctionName,
-            Payload: JSON.stringify(payload),
-            LogType: LogType.Tail,
-          }),
+    const result = await lambdaClient.send(
+      new InvokeCommand({
+        FunctionName: yarnInstallFunctionName,
+        Payload: JSON.stringify(payload),
+        LogType: LogType.Tail,
+      }),
+      {
+        abortSignal: AbortSignal.timeout(
+          YARN_INSTALL_LAMBDA_TIMEOUT_SECONDS * 1000,
         ),
-      timeoutMs: YARN_INSTALL_LAMBDA_TIMEOUT_SECONDS * 1000,
-    });
+      },
+    );
 
     if (result.FunctionError) {
       const parsedResult = result.Payload
@@ -529,17 +529,16 @@ export class LambdaDriver implements LogicFunctionDriver {
       builtFileName,
     };
 
-    const result = await callWithTimeout({
-      callback: () =>
-        lambdaClient.send(
-          new InvokeCommand({
-            FunctionName: builderFunctionName,
-            Payload: JSON.stringify(payload),
-            LogType: LogType.Tail,
-          }),
-        ),
-      timeoutMs: BUILDER_LAMBDA_TIMEOUT_SECONDS * 1000,
-    });
+    const result = await lambdaClient.send(
+      new InvokeCommand({
+        FunctionName: builderFunctionName,
+        Payload: JSON.stringify(payload),
+        LogType: LogType.Tail,
+      }),
+      {
+        abortSignal: AbortSignal.timeout(BUILDER_LAMBDA_TIMEOUT_SECONDS * 1000),
+      },
+    );
 
     if (result.FunctionError) {
       const parsedResult = result.Payload
@@ -1195,9 +1194,8 @@ export class LambdaDriver implements LogicFunctionDriver {
       const lambdaClient = await this.getLambdaClient();
 
       const invokeStart = Date.now();
-      const result = await callWithTimeout({
-        callback: () => lambdaClient.send(command),
-        timeoutMs,
+      const result = await lambdaClient.send(command, {
+        abortSignal: AbortSignal.timeout(timeoutMs),
       });
       const invokeSendMs = Date.now() - invokeStart;
 
@@ -1248,6 +1246,13 @@ export class LambdaDriver implements LogicFunctionDriver {
         );
       }
 
+      if (error instanceof Error && error.name === 'TimeoutError') {
+        throw new LogicFunctionException(
+          `Lambda invocation timed out for function '${flatLogicFunction.id}': ${error.message}`,
+          LogicFunctionExceptionCode.LOGIC_FUNCTION_EXECUTION_TIMEOUT,
+        );
+      }
+
       if (error instanceof LogicFunctionException) {
         throw error;
       }
diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout.ts
deleted file mode 100644
index 9f1f5973aa..0000000000
--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-drivers/utils/call-with-timeout.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export const callWithTimeout = async <T>({
-  callback,
-  timeoutMs,
-}: {
-  callback: () => Promise<T>;
-  timeoutMs: number;
-}): Promise<T> => {
-  return Promise.race([
-    callback(),
-    new Promise<T>((_, reject) =>
-      setTimeout(() => reject(new Error('Execution timed out')), timeoutMs),
-    ),
-  ]);
-};