build: Fix up some ARM-related mistakes

5 jobs for arm-ci in 1 minute and 33 seconds
Status Job ID Name Coverage
  Container
passed #5846979
aarch64
build-container-aarch64

00:00:19

passed #5846978
build-container-x86_64

00:00:10

 
  Build
passed #5846981
aarch64
build-aarch64

00:00:43

passed #5847158
build-x86_64

00:00:30

canceled #5846980
build-x86_64