Hi @FreshyJon
Apparently, that part will soon also be fixed with the Universal Workload - see quote below:
For the rest, I think the way you do it is correct, considering the feature limitations.
I don’t have other tips, but hopefully others might have