Customising add listing form

Hi

I have two custom post types on my site ie. Property and Commercial. Each has different categories under them. When l go to add Property form everything is fine and l can see the property categories. The problem comes when l select add commercial form, I see categories from property again instead of commercial.

Please help me on how l can customise the Add commercial form to show categories under its name. I want to be able to add information from the front end through their respective forms. Will also be adding more custom post types in the future

Thank you