A) Copy either the server or workstation query and delete
And tblDomainroles.Domainrolename In (...)
from the WHERE clause.
If you want to know which machines are of which class on your new report, add
tblDomainroles.Domainrolename to the list of columns on the report.
B) Assuming the build version you're referring to is the OS build, add
tblAssets.BuildNumber to the report. Potentially more usefully, you might prefer
tblAssets.Version; that's the 2004, 1909, 1903, 1809, etc. that the versions are better known by.