Port away from deprecated standard path

3 jobs for !45 with work/data in 8 minutes and 51 seconds (queued for 2 minutes and 15 seconds)
latest merge request