diff --git a/src/aare/daq/server.py b/src/aare/daq/server.py
index cb3b4ed2..ce4a1c6d 100644
--- a/src/aare/daq/server.py
+++ b/src/aare/daq/server.py
@@ -133,8 +133,8 @@ async def lifespan(application: FastAPI):
     yield  # ── application serves requests here ──
 
     # Shutdown: add cleanup here if needed
-    daq.shutdown()
     logger.info(f"Worker {os.getpid()} shutting down.")
+    daq.shutdown()
 
 
 app = FastAPI(lifespan=lifespan)
@@ -2531,6 +2531,8 @@ def main():
         proxy_headers=False,
         log_config=get_uvicorn_logging_config(),
         timeout_worker_healthcheck=30,
+        timeout_graceful_shutdown=1,
+        timeout_keep_alive=30,
     )