Change to after/before instead of depends_on to get inter-task dependencies working more reliably.