Enable DHCP relay to get view of ip lease in internal DHCP server instead of Fortigate

Hi Folks

Device is fortigate firewall and all subnets User, Corp, Servers are separated by VLANS interface in firewall and it does routing for us. I assume it would be pretty straight forward to change DHCP server to DHCP relay

my question is: both scopes are there in DHCP will it work and serve IP on to different subnets or do I need to enable routing and remote service in it?

present DHCP view. I want to see IP lease info in here instead of Firewall.

Pls correct me if my steps are wrong:

For wired subnet (10.x.x.x/24) Go to Network>interfaces> UserVLAN enable IN advance enable DHCP relay and DHCP relay gateway as ip addresss of this VLAN interface,add dhcp ip address.

  For wireless(0.x.5.x./24)  In  wifi and switch controller> SSID> select SSID to relay that to DHCP server and same steps as above