UPF Deployment Model Support on RH OSP16