Pn-21/25 Support For Hyper-Converted Infrastructure