Switch to long-lived forks