[UPDATE] Move earlier to before provisioning