Thanks AriaUpdated for the needed clarification it's so helpful and I like this change from day one.
There's a different blogpost on the differences about Windows 10 and 11 which I really don't like for certain reasons.
This change and your excellent job on documentation and recommendations is very practical.
I agree with Jeremy Moskowitz since it seems the split logic of different W10 and W11 ADMX have run its course.
I would like to recommend adding a Windows 11 OS category to the filtering option.
It cannot be wrong to add the release too as we will have only one per year.
You know that a lot of settings worked only specific builds having these filtered or included in the compatible with OS metadata would be of additional help for CSP and GPO.
What do you think about it? Can the release and build (21H2) be added to either the OS filtering or description?