diff --git a/main.go b/main.go
index 2aca31b..7ff001d 100644
--- a/main.go
+++ b/main.go
@@ -30,6 +30,7 @@ const serviceName = "ollie"
 var tcpAddr = flag.String("tcp", "", "also listen on TCP address (e.g. :564)")
 var strict = flag.Bool("strict", false, "only allow tool steps; reject inline code")
 var yolo = flag.Bool("yolo", false, "skip landrun sandbox for execute_code")
+var nodbus = flag.Bool("nodbus", false, "disable D-Bus adapter (for headless/container use)")
 
 // ModelCache caches the list of models from all backends.
 type ModelCache struct {
@@ -185,6 +186,9 @@ func daemonize(pidPath string) {
 	if *yolo {
 		args = append(args, "-yolo")
 	}
+	if *nodbus {
+		args = append(args, "-nodbus")
+	}
 	cmd := exec.Command(exe, args...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
 	if err := cmd.Start(); err != nil {
@@ -263,8 +267,10 @@ func runServer(sockPath, pidPath string) {
 	})
 
 	// Start D-Bus adapter (best-effort; pure 9P still works without it).
-	dbusAdapter = startDBus(mgr)
-	dbusAdapter.WatchExisting()
+	if !*nodbus {
+		dbusAdapter = startDBus(mgr)
+		dbusAdapter.WatchExisting()
+	}
 
 	// Prefetch models asynchronously at startup
 	go modelCache.Refresh()