diff --git a/.cirrus.yml b/.cirrus.yml
index f6a79d1022..a36bee1317 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/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 0000000000..996c397f61
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,21 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/requirements.txt
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: