diff --git a/java-21-konajdk.spec b/java-21-konajdk.spec
index 8007beb608faddc693b94c2da011e6cc9e91b081..d7d42ed6bf757074f6799d734716c0d2de61878e 100644
--- a/java-21-konajdk.spec
+++ b/java-21-konajdk.spec
@@ -9,11 +9,10 @@
 # upstream jdk version, openjdkver is not equal to majorver when version little than 9.
 %global majorver            21
 %global minorver            0
-%global fixver              11
+%global fixver              12
 %global kona_url            https://github.com/Tencent/TencentKona-%{majorver}
 
 # distro release extra infomation
-%global rpmrelease          1
 %global buildver            1
 %global debug_level         release
 %define debug_package       %{nil}
@@ -35,7 +34,7 @@
 %global sourcedir           TencentKona-%{majorver}-%{tarname}
 %endif
 %ifarch loongarch64
-%global sourcedir           TencentKona-%{majorver}-%{tarname}-LoongArch
+%global sourcedir           TencentKona-%{majorver}-%{tarname}-universal
 %endif
 
 %global vendor_version_string TencentKonaJDK
@@ -109,14 +108,14 @@
 Summary:    JDK Runtime Environment %{majorver}
 Name:       java-%{majorver}-konajdk
 Version:    %{majorver}.%{minorver}.%{fixver}
-Release:    %{rpmrelease}%{?dist}
+Release:    1%{?dist}
 Group:      Development/Languages
 License:    ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
 URL:        %{kona_url}
 # source code of X64 and Aarch64
 Source0:    %{url}/archive/%{tarname}/%{tarname}.tar.gz
-# source code of Loongarch64
-Source1:    %{url}/archive/refs/tags/%{tarname}-LoongArch.tar.gz
+# source code of Loongarch64, upstream LoongArch support moved to universal branch
+Source1:    %{url}/archive/refs/tags/%{tarname}-universal.tar.gz
 # bootstrap building, need prebuild binary
 # have not tested bootstrap building of konajdk 8/11/17 for x86 and arm
 %if %{bootstrap}
@@ -1478,6 +1477,11 @@ post_state=$1
 
 
 %changelog
+* Thu Aug 06 2026 Zhao Zhen <jeremiazhao@tencent.com> - 21.0.12-1
+- [Type] security
+- [DESC] Updated to upstream version 21.0.12
+- LoongArch source switched to upstream universal branch (tag TencentKona-21.0.12-universal)
+
 * Thu May 14 2026 Zhao Zhen <jeremiazhao@tencent.com> - 21.0.11-1
 - [Type] security
 - [DESC] Updated to upstream version 21.0.11
diff --git a/sources b/sources
index 74cb782215a929cefe336e5176161cc53b8b1480..5dca79f189a4e40d0e8a4cc6c67242eb504099a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (TencentKona-21.0.11.tar.gz) = 17ba632daf54d19dfd98b2dac97bf4f0ce0a77b978e3f922d13d4690efd8654727017e7e0887d8e397bad7b0e6a9428cab40145b9f625b399bde11f51bd1eda5
-SHA512 (TencentKona-21.0.11-LoongArch.tar.gz) = 1c44d9d2420652ff2b26e312512302bdad3041658fbe7cc4340533135e730557b0610787f03a10cb9da166ebf8379123d8f427eb6b1d130d0674ab85f30b887a
+SHA512 (TencentKona-21.0.12.tar.gz) = c3f3fe99dce9ae86cdd27e891943184367c61c11aeae5888a12b5ff9d5297e285fcdfafb0f13fbb0e25c99f70b99a2ef54d00d16b2ef76212bf8cb80a5e59f61
+SHA512 (TencentKona-21.0.12-universal.tar.gz) = f416774dca5cba8b2fb71eb96b676165ef76b79c622d3390168c46be50747a52f24d8e9f33e19c3c6528ceb9f719a5339287945846b062d902a3dc3cc1821bbe