[FIX]Set payment system

Merged Gastón Bertolani requested to merge 8.0-set-payment-system into 8.0-preprod

Merge request reports