Add layout=NONE to packaging tools