Yea we’re doing something similiar. Only update base images for bigger OS updates or if something breaks or can break.

The general idea is to have config that works for both new PCs and the ones that are already in use. Saves on maintaining two configuration methods.