diff --git a/pkg/cmd/roachtest/tests/disk_stall.go b/pkg/cmd/roachtest/tests/disk_stall.go
index 9208f1b0df1c..c6fda183ce6e 100644
--- a/pkg/cmd/roachtest/tests/disk_stall.go
+++ b/pkg/cmd/roachtest/tests/disk_stall.go
@@ -73,9 +73,6 @@ func runDiskStalledWALFailover(
 		startOpts.RoachprodOpts.StoreCount = 2
 	}
 	startOpts.RoachprodOpts.ExtraArgs = []string{
-		// Adopt buffering of the file logging to ensure that we don't block on
-		// flushing logs to the stalled device.
-		"--log", fmt.Sprintf(`{file-defaults: {dir: "%s", buffered-writes: false, buffering: {max-staleness: 1s, flush-trigger-size: 256KiB, max-buffer-size: 50MiB}}}`, s.LogDir()),
 		"--wal-failover=" + failoverFlag,
 	}
 	c.Start(ctx, t.L(), startOpts, startSettings, c.CRDBNodes())
diff --git a/pkg/roachprod/install/files/cockroachdb-logging.yaml b/pkg/roachprod/install/files/cockroachdb-logging.yaml
index ba57e161e919..c47b5b38bb5d 100644
--- a/pkg/roachprod/install/files/cockroachdb-logging.yaml
+++ b/pkg/roachprod/install/files/cockroachdb-logging.yaml
@@ -1,7 +1,11 @@
 ---
 file-defaults:
   auditable: false
-  buffered-writes: true
+  buffered-writes: false
+  buffering:
+    max-staleness: 5s
+    flush-trigger-size: 256KiB
+    max-buffer-size: 50MiB
   dir: #{ .LogDir #}
   exit-on-error: false
   filter: INFO