Merge "Add missing base path on deploy jobs"