chore: misc small cleanups

Nigel Kukard requested to merge nkukard/containers-commitlint:nkupdates-edge into edge Mar 07, 2023