Fix baseurl issues part 2 (cherry picked from commit db581c4d9b) Signed-off-by: Joshua Boniface <joshua@boniface.me>
db581c4d9b