Where self make rcm invoice upload to gstr-1 or gstr-2

Where to  upload RCM Invoice for Unregistered purchased by Recipient ????

1) GSTR-1 -- Problems: GSTIN No. is mandatory... but there is no GSTIN No. of Unregistered supplier. If Recipient  put Own GSTIN No. and Select Reverse Charge Option .. Error massage has appeared >> " Supplier and Recipient cannot be same GSTIN " ( Reverse Charge Option has only B2B section in GSTR-1)

Question: Then how to upload RCM Invoice at GSTR-1 which contain without GSTIN No.

2) GSTR-2 -- Problems : This section is mainly Input Credit Avail portion. But Our  RCM is GST Liabilities which to pay by Recipient .  If RCM Invoice upload here under" Purchased from unregistered ".. then how to RCM GST liabilities is generated and it will be added with Total GST Liabilities which to pay by Recipient

Please reply in details ... thanks