Modify final incremental and nightly factory reset