Rebase against correct branch in pkg jobs