A couple of fixes #1574

Job	Run time
build-container (arm64, ubuntu-24.04-arm)	3m 28s
build-container (amd64, ubuntu-latest)	4m 43s
build-console (amd64, ubuntu-latest)	2m 9s
build-console (arm64, ubuntu-24.04-arm)	2m 53s
pre-push-check	0s
push-multiarch-manifest	0s
	13m 13s

Provide feedback