diff --git a/runtime/cmake/caches/zos_390-64.cmake b/runtime/cmake/caches/zos_390-64.cmake
index 4f2268f4175..84d131e1b78 100644
--- a/runtime/cmake/caches/zos_390-64.cmake
+++ b/runtime/cmake/caches/zos_390-64.cmake
@@ -35,6 +35,10 @@ if(JAVA_SPEC_VERSION EQUAL 8)
 	set(OMR_ZOS_COMPILE_TARGET "zOSV1R13" CACHE STRING "")
 	set(OMR_ZOS_COMPILE_ARCHITECTURE 7 CACHE STRING "")
 	set(OMR_ZOS_COMPILE_TUNE 10 CACHE STRING "")
+elseif (JAVA_SPEC_VERSION GREATER_EQUAL 25)
+    set(OMR_ZOS_COMPILE_TARGET "zOSV3R1" CACHE STRING "")
+    set(OMR_ZOS_COMPILE_ARCHITECTURE 10 CACHE STRING "")
+    set(OMR_ZOS_COMPILE_TUNE 12 CACHE STRING "")
 else()
 	set(OMR_ZOS_COMPILE_TARGET "zOSV2R3" CACHE STRING "")
 	set(OMR_ZOS_COMPILE_ARCHITECTURE 10 CACHE STRING "")