diff --git a/backend/windmill-worker/nsjail/download.py.config.proto b/backend/windmill-worker/nsjail/download.py.config.proto
index 5c2989417f..c582642986 100644
--- a/backend/windmill-worker/nsjail/download.py.config.proto
+++ b/backend/windmill-worker/nsjail/download.py.config.proto
@@ -18,6 +18,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: true
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/download.rust.config.proto b/backend/windmill-worker/nsjail/download.rust.config.proto
index 7239a77b74..a7e480eb2d 100644
--- a/backend/windmill-worker/nsjail/download.rust.config.proto
+++ b/backend/windmill-worker/nsjail/download.rust.config.proto
@@ -10,6 +10,7 @@ cwd: "/tmp"
 
 clone_newnet: false
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.ansible.config.proto b/backend/windmill-worker/nsjail/run.ansible.config.proto
index 65a8ea7006..215484870f 100644
--- a/backend/windmill-worker/nsjail/run.ansible.config.proto
+++ b/backend/windmill-worker/nsjail/run.ansible.config.proto
@@ -14,6 +14,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.bash.config.proto b/backend/windmill-worker/nsjail/run.bash.config.proto
index 63018f7655..832579d950 100644
--- a/backend/windmill-worker/nsjail/run.bash.config.proto
+++ b/backend/windmill-worker/nsjail/run.bash.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.bun.config.proto b/backend/windmill-worker/nsjail/run.bun.config.proto
index 527d49cf7a..5c3738bc71 100644
--- a/backend/windmill-worker/nsjail/run.bun.config.proto
+++ b/backend/windmill-worker/nsjail/run.bun.config.proto
@@ -14,6 +14,7 @@ clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 clone_newcgroup: false
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 
diff --git a/backend/windmill-worker/nsjail/run.csharp.config.proto b/backend/windmill-worker/nsjail/run.csharp.config.proto
index 389448eff0..d9f53e3b12 100644
--- a/backend/windmill-worker/nsjail/run.csharp.config.proto
+++ b/backend/windmill-worker/nsjail/run.csharp.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.go.config.proto b/backend/windmill-worker/nsjail/run.go.config.proto
index 1ba6f52d5e..c03b5ee73b 100644
--- a/backend/windmill-worker/nsjail/run.go.config.proto
+++ b/backend/windmill-worker/nsjail/run.go.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp/go"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 
diff --git a/backend/windmill-worker/nsjail/run.java.config.proto b/backend/windmill-worker/nsjail/run.java.config.proto
index 032072fb7c..8b123432e2 100644
--- a/backend/windmill-worker/nsjail/run.java.config.proto
+++ b/backend/windmill-worker/nsjail/run.java.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.nu.config.proto b/backend/windmill-worker/nsjail/run.nu.config.proto
index 8d27d92455..52742cf222 100644
--- a/backend/windmill-worker/nsjail/run.nu.config.proto
+++ b/backend/windmill-worker/nsjail/run.nu.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.php.config.proto b/backend/windmill-worker/nsjail/run.php.config.proto
index d3752d33b7..1cf61dbfb2 100644
--- a/backend/windmill-worker/nsjail/run.php.config.proto
+++ b/backend/windmill-worker/nsjail/run.php.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.powershell.config.proto b/backend/windmill-worker/nsjail/run.powershell.config.proto
index 93a48d4fec..f7580b7aa7 100644
--- a/backend/windmill-worker/nsjail/run.powershell.config.proto
+++ b/backend/windmill-worker/nsjail/run.powershell.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.python3.config.proto b/backend/windmill-worker/nsjail/run.python3.config.proto
index b49b9cfbfe..31246b1aca 100644
--- a/backend/windmill-worker/nsjail/run.python3.config.proto
+++ b/backend/windmill-worker/nsjail/run.python3.config.proto
@@ -14,6 +14,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 mount_proc: true
diff --git a/backend/windmill-worker/nsjail/run.rust.config.proto b/backend/windmill-worker/nsjail/run.rust.config.proto
index d5265f8ddd..475a99873f 100644
--- a/backend/windmill-worker/nsjail/run.rust.config.proto
+++ b/backend/windmill-worker/nsjail/run.rust.config.proto
@@ -11,6 +11,7 @@ cwd: "/tmp"
 clone_newnet: false
 clone_newuser: {CLONE_NEWUSER}
 
+skip_setsid: true
 keep_caps: false
 keep_env: true
 
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 5682bf2a19..08869ca20f 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -850,26 +850,26 @@ pub fn start_interactive_worker_shell(
                     }
                     Ok(None) => {
                         let now = Instant::now();
-                        match last_executed_job {
+                        let nap_time = match last_executed_job {
                             Some(last)
                                 if now.duration_since(last).as_secs()
                                     > TIMEOUT_TO_RESET_WORKER_SHELL_NAP_TIME_DURATION =>
                             {
-                                tokio::time::sleep(Duration::from_secs(
+                                Duration::from_secs(
                                     WORKER_SHELL_NAP_TIME_DURATION,
-                                ))
-                                .await;
+                                )
                             }
                             _ => {
-                                tokio::select! {
-                                    _ = tokio::time::sleep(Duration::from_millis(*SLEEP_QUEUE * 10)) => {
-                                    }
-                                    _ = killpill_rx.recv() => {
-                                        break;
-                                    }
-                                }
+                                Duration::from_millis(*SLEEP_QUEUE * 10)
                             }
-                        }
+                        };
+                        tokio::select! {
+                            _ = tokio::time::sleep(nap_time) => {
+                            }
+                            _ = killpill_rx.recv() => {
+                                break;
+                            }
+                        }   
                     }
 
                     Err(err) => {