Is there a way to target both windows client OS and citrix servers?

Hi all,

I've hit a wall and really struggling.

We currently use WMI filtering on GPOs to target windows client OS systems by using the below query.

Select * from Win32_OperatingSystem Where ProductType="1"

However now that our organisation is virtualising applications via citrix we need these policies to apply to those servers as well (we need drives mapping for staff). We don't want them to apply to all servers.

There are multiple users who will be logging into these servers from different locations so we can't just remove the filter.

Can anyone help?

thanks

Matt Smith