diff --git a/.cirrus.yml b/.cirrus.yml
index 7a110cb90f..689c95360e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -375,7 +375,7 @@ osx_alt_build_task:
         TEST_FLAVOR: "altbuild"
         ALT_NAME: 'OSX Cross'
     osx_instance:
-        image: 'big-sur-base'
+        image: ghcr.io/cirruslabs/macos-ventura-base:latest
     setup_script:
         - brew install go
         - brew install go-md2man
diff --git a/Makefile b/Makefile
index 10944dcc96..45dff86619 100644
--- a/Makefile
+++ b/Makefile
@@ -262,8 +262,10 @@ volume-plugin-test-img:
 test/goecho/goecho: $(wildcard test/goecho/*.go)
 	$(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
 
+# The ./test/version/version binary is executed in other make steps
+# so we have to make sure the version binary is built for NATIVE_GOARCH.
 test/version/version: version/version.go
-	$(GO) build -o $@ ./test/version/
+	GOARCH=$(NATIVE_GOARCH) $(GO) build -o $@ ./test/version/
 
 .PHONY: codespell
 codespell: