Gii and template still use dropped form-group in bootstrap5

Working on upgrading my project to bootstrap5 (from 4). Noticed the template and gii generate

<div class="form-group">

which has been dropped.
Ref: Migrating to Bootstrap v5 - Forms.

I think the fix is to simply use mb-3 instead of form-group. The page looks the same because I believe the default is mb-3.