Thread-hijack: If you managed to get all of your templates consolidated with the OU part handled, how are you performing departmental software install? As a separate job?
We use more templates but they are mostly the same sharing less than 10 includes that do most of the work. Only really the OU and dept software is what is different across the templates.
In my own co's case, because we do dept software install during provisioning, the templates have to be different. The OU is just one more unique property.