diff --git a/dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz b/dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz
similarity index 86%
rename from dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz
rename to dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz
index 6cf184b3edaa43276a85266f399c062447e57db9..c066aa4702bf2d59fc7341ad5b8b3d5d57dac6f7 100644
Binary files a/dragonwell-extended-11.0.21.18_jdk-11.0.21-ga.tar.gz and b/dragonwell-extended-11.0.24.21_jdk-11.0.24-ga.tar.gz differ
diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec
index a22067477473432a2b89b160396b88cc92642c12..9c3f83bbbcee4afa9c7ce28dacfceda23e736565 100644
--- a/java-11-alibaba-dragonwell.spec
+++ b/java-11-alibaba-dragonwell.spec
@@ -18,17 +18,16 @@
 
 %global major_ver        11
 %global inter_ver        0
-%global update_ver       21
-%global patch_ver        18
-%global alibaba_ver      9
-%global build_ver        9
+%global update_ver       24
+%global alibaba_ver      21
+%global build_ver        8
 %global dragonwell_ver   %{major_ver}.%{inter_ver}.%{update_ver}
-%global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{patch_ver}
+%global newdragonwellver %{major_ver}.%{inter_ver}.%{update_ver}.%{alibaba_ver}
 %global distro_version   %{dragonwell_ver}-%(printf "b%02d" %{anolis_release})
 %global dragsourcename   dragonwell-extended-%{newdragonwellver}_jdk-%{dragonwell_ver}-ga
 %global dragbuildname    dragonwell%{major_ver}-dragonwell-extended-%{newdragonwellver}_jdk-%{dragonwell_ver}-ga
-%global combiver         $( expr 20 '*' %{alibaba_ver} + %{build_ver} )
-%global priority         %( printf '%02d%02d%02d%02d%02d' %{major_ver} %{inter_ver} %{update_ver} %{patch_ver} %{combiver} )
+%global combiver         $( expr 20 '*' %{build_ver} + %{build_ver} )
+%global priority         %( printf '%02d%02d%02d%02d%02d' %{major_ver} %{inter_ver} %{update_ver} %{alibaba_ver} %{combiver} )
 
 %global origin       openjdk
 %global top_level_dir_name dragonwell 
@@ -107,10 +106,6 @@
 %define stap_dir arm64
 %endif
 
-%global tapsetroot /usr/share/systemtap
-%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{stap_dir}
-
 %global alternatives_requires %{_sbindir}/alternatives
 
 %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -167,8 +162,6 @@ License:        GPL-v2
 URL:            https://github.com/dragonwell-project/dragonwell11
 Source0:        https://github.com/dragonwell-project/dragonwell11/archive/refs/tags/%{dragsourcename}.tar.gz
 
-Source11:       tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
-
 BuildArch:      x86_64 aarch64
 
 BuildRequires:  make vim
@@ -659,29 +652,6 @@ Alibaba Dragonwell11 Runtime Environment src fastdebug
 mv %{dragbuildname} %{top_level_dir_name}
 chmod +x %{top_level_dir_name}/configure
 
-# Extract systemtap tapsets
-tar --strip-components=1 -x -I xz -f %{SOURCE11}
-	
-%if %{with slowdebug}
-cp -r tapset tapset-slowdebug
-%endif
-	
-%if %{with fastdebug}
-cp -r tapset tapset-fastdebug
-%endif
-
-for suffix in %{build_loop} ; do
-  for file in "tapset"$suffix/*.in; do
-    OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
-    sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
-    sed -e "s:@JAVA_SPEC_VER@:%{major_ver}:g" $file.1 > $file.2
-    sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
-    sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
-    sed -i -e "s:@INSTALL_ARCH_DIR@:%{arch_dir}:g" $OUTPUT_FILE
-    sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
-  done
-done
-
 %build
 # How many CPU's do we have?
 export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
@@ -718,7 +688,7 @@ function buildjdk() {
         --without-version-opt \
         --with-version-build="%{build_ver}" \
         --with-version-feature="%{major_ver}" \
-        --with-version-patch="%{patch_ver}" \
+        --with-version-patch="%{alibaba_ver}" \
         --with-version-date="$(date +%Y-%m-%d)" \
         --enable-unlimited-crypto \
       	--with-zlib=system \
@@ -833,17 +803,6 @@ for suffix in %{build_loop} ; do
   cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
 
   pushd ${jdk_image}
-    install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset
-    cp -a $RPM_BUILD_DIR/%{dragbuildname}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/
-    pushd  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/
-      tapsetFiles=`ls *.stp`
-    popd
-    install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
-    for name in $tapsetFiles ; do
-      targetName=`echo $name | sed "s/.stp/$suffix.stp/"`
-      ln -sf %{_jvmdir}/%{sdkdir -- $suffix}/tapset/$name $RPM_BUILD_ROOT%{tapsetdir}/$targetName
-    done
-  
     #Install version-ed symlinks
     pushd $RPM_BUILD_ROOT%{_jvmdir}
       ln -sf %{sdkdir -- $suffix} %{jrelnk -- $suffix}
@@ -870,7 +829,7 @@ for suffix in %{build_loop} ; do
     # Install Javadoc documentation
     install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
     cp -a ${top_dir_abs_main_build_path}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-    built_doc_archive=jdk-%{dragonwell_ver}.%{patch_ver}+%{build_ver}-docs.zip
+    built_doc_archive=jdk-%{dragonwell_ver}.%{alibaba_ver}+%{build_ver}-docs.zip
     cp -a ${top_dir_abs_main_build_path}/bundles/${built_doc_archive} \
     $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}/bundles/
   fi
@@ -1627,7 +1586,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_jvmdir}/%{sdkdir}/bin/jaotc
 %{_jvmdir}/%{sdkdir}/include
 %{_jvmdir}/%{sdkdir}/lib/ct.sym
-%{_jvmdir}/%{sdkdir}/tapset
 %{_mandir}/man1/jar-%{uniquesuffix}.1*
 %{_mandir}/man1/jarsigner-%{uniquesuffix}.1*
 %{_mandir}/man1/javac-%{uniquesuffix}.1*
@@ -1647,10 +1605,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_mandir}/man1/jstatd-%{uniquesuffix}.1*
 %{_mandir}/man1/serialver-%{uniquesuffix}.1*
 
-%dir %{tapsetroot}
-%dir %{tapsetdirttapset}
-%dir %{tapsetdir}
-%{tapsetdir}/*%{_arch}.stp
 %if %is_system_jdk
 %ghost %{_bindir}/javac
 %ghost %{_jvmdir}/java
@@ -1864,7 +1818,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jaotc
 %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/include
 %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/ct.sym
-%{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/tapset
 %{_mandir}/man1/jar-%{uniquesuffix -- %{slowdebug_build}}.1*
 %{_mandir}/man1/jarsigner-%{uniquesuffix -- %{slowdebug_build}}.1*
 %{_mandir}/man1/javac-%{uniquesuffix -- %{slowdebug_build}}.1*
@@ -1884,11 +1837,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_mandir}/man1/jstatd-%{uniquesuffix -- %{slowdebug_build}}.1*
 %{_mandir}/man1/serialver-%{uniquesuffix -- %{slowdebug_build}}.1*
 
-%dir %{tapsetroot}
-%dir %{tapsetdirttapset}
-%dir %{tapsetdir}
-%{tapsetdir}/*%{_arch}%{slowdebug_build}.stp
-
 %files static-libs-slowdebug
 %dir %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/static
 %dir %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/static/linux-%{arch_dir}
@@ -2050,7 +1998,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jaotc
 %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/include
 %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/ct.sym
-%{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/tapset
 %{_mandir}/man1/jar-%{uniquesuffix -- %{fastdebug_build}}.1*
 %{_mandir}/man1/jarsigner-%{uniquesuffix -- %{fastdebug_build}}.1*
 %{_mandir}/man1/javac-%{uniquesuffix -- %{fastdebug_build}}.1*
@@ -2070,11 +2017,6 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %{_mandir}/man1/jstatd-%{uniquesuffix -- %{fastdebug_build}}.1*
 %{_mandir}/man1/serialver-%{uniquesuffix -- %{fastdebug_build}}.1*
 
-%dir %{tapsetroot}
-%dir %{tapsetdirttapset}
-%dir %{tapsetdir}
-%{tapsetdir}/*%{_arch}%{fastdebug_build}.stp
-
 %files static-libs-fastdebug
 %dir %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/static
 %dir %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/static/linux-%{arch_dir}
@@ -2095,6 +2037,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{
 %endif
 
 %changelog
+* Thu Aug 22 2024 lvfei.lv <lvfei.lv@alibaba-inc.com> - 3:11.0.24.21+8-1
+- update package to 11.0.24.21+8, and remove patch_ver and tapset
+
 * Mon Jan 29 2024 lvfei.lv <lvfei.lv@alibaba-inc.com> - 3:11.0.21.18+9-1
 - update package to 11.0.21.18+9
 
diff --git a/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz b/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
deleted file mode 100644
index bc4e1747e3a003d6e7e64363425c8e286044c792..0000000000000000000000000000000000000000
Binary files a/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz and /dev/null differ