Extend the fix from !5162 (merged) to cover the aarch64 name too.
aarch64
Fixes: #21237 (closed) Backport: release