diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6ac7178..567a1431 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2.1
 parameters:
     tools-cache-version:
         type: string
-        default: "v11"
+        default: "v12"
 
 # default execution env.s
 executors:
diff --git a/generators/cva6 b/generators/cva6
index 139741a5..47173903 160000
--- a/generators/cva6
+++ b/generators/cva6
@@ -1 +1 @@
-Subproject commit 139741a584d7e3c0446db592b5d99529bd6cf9fa
+Subproject commit 4717390310f8cf14f608e2a1d72d5c6f6a9ffc0f