That is the correct solution. The metallic and roughness maps need to be interpreted as linear.
Cheers,