chore: misc small cleanups

Nigel Kukard requested to merge nkukard/containers-alpine:nkupdates-v3.17 into v3.17 Mar 07, 2023