Use the drain timeout

- Use the drain timeout
- Set the timeouts properly

[#69785590]

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>