diff --git a/cmake/springbok_bytecode_module.cmake b/cmake/springbok_bytecode_module.cmake
index 427139e..11aef33 100644
--- a/cmake/springbok_bytecode_module.cmake
+++ b/cmake/springbok_bytecode_module.cmake
@@ -77,7 +77,7 @@
       "-iree-hal-target-backends=dylib-llvm-aot"
       "-iree-llvm-target-triple=riscv32-pc-linux-elf"
       "-iree-llvm-target-cpu=generic-rv32"
-      "-iree-llvm-target-cpu-features=+m,+f,+experimental-v"
+      "-iree-llvm-target-cpu-features=+m,+f,+v"
       "-iree-llvm-target-abi=ilp32"
       "-iree-llvm-link-embedded=true"
       "-iree-llvm-debug-symbols=false"
diff --git a/cmake/springbok_c_module.cmake b/cmake/springbok_c_module.cmake
index 29c1ae4..1b86eb7 100644
--- a/cmake/springbok_c_module.cmake
+++ b/cmake/springbok_c_module.cmake
@@ -87,8 +87,7 @@
   list(APPEND _TRANSLATE_ARGS "-iree-hal-target-backends=dylib-llvm-aot")
   list(APPEND _TRANSLATE_ARGS "-iree-llvm-target-triple=riscv32-pc-linux-elf")
   list(APPEND _TRANSLATE_ARGS "-iree-llvm-target-cpu=generic-rv32")
-  #TODO(b/215397476): Re-enable RVV for static library
-  list(APPEND _TRANSLATE_ARGS "-iree-llvm-target-cpu-features=+m,+f")
+  list(APPEND _TRANSLATE_ARGS "-iree-llvm-target-cpu-features=+m,+f,+v")
   list(APPEND _TRANSLATE_ARGS "-iree-llvm-target-abi=ilp32")
   list(APPEND _TRANSLATE_ARGS "-iree-llvm-link-embedded=false")
   list(APPEND _TRANSLATE_ARGS "-iree-llvm-link-static")