Fix urls to workaround known validator issue on marketplace