improved bundle config preparation