diff --git a/backend/src/main.rs b/backend/src/main.rs
index c3538601dd..9b39094236 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -1294,6 +1294,7 @@ Windmill Community Edition {GIT_VERSION}
             }
         }
     }
+    std::process::exit(0);
     Ok(())
 }
 
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index 98dac87744..af34bc3513 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -18,7 +18,7 @@ use std::{
     },
 };
 
-use tokio::sync::broadcast;
+use tokio::{spawn, sync::broadcast};
 
 use ee_oss::CriticalErrorChannel;
 use error::Error;
@@ -198,8 +198,47 @@ pub async fn shutdown_signal(
         },
     }
 
+    spawn(async move {
+        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        tokio::select! {
+            _ = terminate() => {
+                tracing::info!("2nd shutdown monitor received terminate");
+            },
+            _ = tokio::signal::ctrl_c() => {
+                tracing::info!("2nd shutdown monitor received ctrl-c");
+            },
+        }
+
+        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+        tokio::select! {
+            _ = tokio::signal::ctrl_c() => {},
+            _ = rx.recv() => {
+                tracing::info!("2nd shutdown monitor received killpill");
+            },
+        }
+
+        tracing::info!("Second terminate signal received, forcefully exiting");
+
+        let handle = tokio::runtime::Handle::current();
+        let metrics = handle.metrics();
+        tracing::info!(
+            "Alive tasks: {}, global queue depth: {}",
+            metrics.num_alive_tasks(),
+            metrics.global_queue_depth()
+        );
+
+        std::process::exit(1);
+    });
+
     tracing::info!("signal received, starting graceful shutdown");
     let _ = tx.send();
+
+    spawn(async move {
+        tokio::time::sleep(std::time::Duration::from_hours(24 * 7)).await;
+        tracing::info!("Forcefully exiting after 7 days");
+        std::process::exit(1);
+    });
+
     Ok(())
 }