Since you have two separate systems requiring two separate sets of drivers, I would definitely recommend trying out the Microsoft Deployment Toolkit (MDT)
to deploy. MDT is essentially a single interface, called the Deployment Workbench, which automates the whole range of Microsoft deployment technologies.
The most applicable benefit of this to your situation is that it automatically injects drivers from a driver store
during deployment based on the hardware detected. You can basically copy the driver store for both systems into MDT and then let the software sort it out. You may want to test it out first though, as some drivers require more than just the files which allow the operating system to communicate with the hardware, such as some drivers for buttons to control media or notebook functions. For these you may need to add them to MDT as an application to be installed automatically upon deployment.
The method linked by Netsolved would also work, and for only 30 machines may be faster than learning the ins and outs of MDT. It is slightly more difficult to create a hardware agnostic image using this method, as configuring an external driver share is more difficult, but it can be done. You can find resources for the deployment of Windows on the Deliver and Deploy Windows 7
page on the Springboard Series on TechNet including the tutorial linked by Netsolved, other walkthroughs of specific Microsoft deployment technologies, and instructions and guides on MDT and its use.
Windows Outreach Team- IT Pro
The Springboard Site on TechNet