Rework setup to use machine scripts