diff --git a/openjdk-21.spec b/openjdk-21.spec
index 29d27757109e1e57b1ea885e1a834e4169e79da5..7886e35bf9ce6d3def8c5a874de641af8c0105de 100644
--- a/openjdk-21.spec
+++ b/openjdk-21.spec
@@ -905,7 +905,7 @@ Name:    java-21-%{origin}
 Version: %{newjavaver}.%{buildver}
 # This package needs `.rolling` as part of Release so as to not conflict on install with
 # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
-Release: 7
+Release: 8
 
 
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
@@ -1369,6 +1369,12 @@ pushd %{top_level_dir_name}
 %patch94 -p1
 %patch95 -p1
 %patch96 -p1
+popd # openjdk
+%endif
+
+# Isolate from loongarch64 and riscv64
+%ifnarch loongarch64 riscv64
+pushd %{top_level_dir_name}
 %patch97 -p1
 %patch98 -p1
 %patch99 -p1
@@ -1970,6 +1976,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
 
 
 %changelog
+* Wed Dec 17 2025 douyiwang <douyiwang@huawei.com> - 1:21.0.9.10-8
+- Isolate some patches from riscv64
+
 * Mon Dec 8 2025 jihaodi <jihaodi1@huawei.com> - 1:21.0.9.10-7
 - modify Add-SM2-and-KAE-for-OpenSSL3.patch