Reordering machine config, services above env vars