diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index f19b0f2c..f7452ab4 100755
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -3519,6 +3519,12 @@ class AppBase:
                                     if self.action["app_name"].lower() == "shuffle tools":
                                         timeout = 55
 
+                                    timeout_env = os.getenv("SHUFFLE_APP_SDK_TIMEOUT", timeout)
+                                    try:
+                                        timeout = int(timeout_env)
+                                    except Exception as e:
+                                        self.logger.info(f"[WARNING] Failed parsing timeout to int: {e}")
+
                                     #timeout = 30 
 
                                     try:
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index 427a4bee..8fb68483 100755
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -230,6 +230,7 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
 	// log.Printf("image: %s", image)
 	// log.Printf("identifier: %s", identifier)
 	// log.Printf("execution: %+v", workflowExecution)
+	env = append(env, fmt.Sprintf("SHUFFLE_APP_SDK_TIMEOUT=%s", os.Getenv("SHUFFLE_APP_SDK_TIMEOUT")))
 
 	if os.Getenv("IS_KUBERNETES") == "true" {