My best practice is to create a multi-step update policy sequence. After defining the sequence of updates, then move the devices to the production policy. In order to keep things simple, I have the devices registered to the Default policy to set the basic items, i.e. Time Zone and other general items.