Address packaging review comments

See https://bugzilla.redhat.com/show_bug.cgi?id=1689277#c7