chore: mixed small cleanups

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