I am currently assigning windows group policies by associating them to
the container in which the workstation resides.

I have a few special workstations where the group policy should be
slightly different than the default policy. For example, I want to
change just the screen saver lock time out on just on PC so it never locks.

But I want every other setting for this PC to be the same as my others.
Do I have to come up with a second group policy and then remember to
maintain both when I make changes, or is there a way to manage this easier?