diff --git a/doc/man/man5/burst_buffer.conf.5 b/doc/man/man5/burst_buffer.conf.5
index 75bf2a5ab1e5c3eeafb4741af268eed1e1c9b8f8..9961aa1b43bf7f8a54ff4e896c9dca4a661c1263 100644
--- a/doc/man/man5/burst_buffer.conf.5
+++ b/doc/man/man5/burst_buffer.conf.5
@@ -118,13 +118,13 @@ By default, users can view all burst buffers.
 If the stage in of files for a job takes more than this number of seconds,
 the burst buffer will be released and the job will be placed in a held state.
 A Slurm administrator will be required to release the job.
-By default there is no timeout of the stage in process.
+By default there is a one day timeout of the stage in process.
 
 .TP
 \fBStageOutTimeout\fR
 If the stage out of files for a job takes more than this number of seconds,
 the burst buffer will be released and the job will be purged.
-By default there is no timeout of the stage out process.
+By default there is a one day timeout of the stage out process.
 
 .TP
 \fBStartStageIn\fR
diff --git a/src/plugins/burst_buffer/cray/burst_buffer_cray.c b/src/plugins/burst_buffer/cray/burst_buffer_cray.c
index 578aab727799beee441d6d9f29483e1d5e60ed9c..7cdd67fe3e9e17c8913d9a1778e72da004a39ddb 100644
--- a/src/plugins/burst_buffer/cray/burst_buffer_cray.c
+++ b/src/plugins/burst_buffer/cray/burst_buffer_cray.c
@@ -1308,7 +1308,7 @@ static void *_start_stage_in(void *x)
 	if (stage_args->timeout)
 		timeout = stage_args->timeout * 1000;
 	else
-		timeout = 10000;
+		timeout = 60 * 60 * 1000;	/* 3600 secs == 1 hour */
 	op = "setup";
 	START_TIMER;
 	resp_msg = bb_run_script("setup",
@@ -1527,7 +1527,7 @@ static void *_start_stage_out(void *x)
 		if (stage_args->timeout)
 			timeout = stage_args->timeout * 1000;
 		else
-			timeout = 10000;
+			timeout = 60 * 60 * 1000;     /* 3600 secs == 1 hour */
 		op = "dws_post_run";
 		START_TIMER;
 		xfree(resp_msg);
@@ -1683,7 +1683,7 @@ static void *_start_teardown(void *x)
 	if (teardown_args->timeout)
 		timeout = teardown_args->timeout * 1000;
 	else
-		timeout = 10000;
+		timeout = 60 * 60 * 1000;	/* 3600 secs == 1 hour */
 	resp_msg = bb_run_script("teardown",
 				 bb_state.bb_config.get_sys_state,
 				 teardown_argv, timeout, &status);