Get rid of the knockback arrows.
Or if Shove distance becomes a reasonable 5ft. as per the actual rules, also the arrows could be tolerable.
Goblins shouldn't have them anyway. Seems like something that should be used by the likes of an elite order of High Elf Eldritch Knight archers.
