Rebase on single yaml