diff --git a/Makefile b/Makefile
index fefd88f86..b26942b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -408,11 +408,12 @@ prep/repos:
 # workaround for now. Needs to be removed as we move to v9
 	cd cnquery && git fetch && git checkout v8
 	test -x cnspec || git clone https://github.com/mondoohq/cnspec.git
+	cd cnspec && git fetch && git checkout v8
 
 prep/repos/update: prep/repos
 # workaround for now. Needs to be removed as we move to v9
 	cd cnquery; git fetch; git checkout v8 && git pull; cd -;
-	cd cnspec; git checkout main && git pull; cd -;
+	cd cnspec; git checkout v8 && git pull; cd -;
 
 prep/ci/protoc:
 	curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_64.zip