Update maker scripts to be more variable