diff --git a/add-version-txt.patch b/add-version-txt.patch
index 7fd540ce5bbcafe8a87b50035847b4f0d9bd8881..4209b9883bc6476f3389622d6f331a3e70431b03 100644
--- a/add-version-txt.patch
+++ b/add-version-txt.patch
@@ -13,7 +13,7 @@ index 000000000..b717bafbe
 --- /dev/null
 +++ b/version.txt
 @@ -0,0 +1 @@
-+17.0.7.0.13
++17.0.8.0.13
 -- 
 2.19.0
 
diff --git a/jdk-updates-jdk17u-jdk-17.0.7+7.tar.gz b/jdk-updates-jdk17u-jdk-17.0.8+7.tar.gz
similarity index 58%
rename from jdk-updates-jdk17u-jdk-17.0.7+7.tar.gz
rename to jdk-updates-jdk17u-jdk-17.0.8+7.tar.gz
index 96cb034768f943cf3f12b04c0c5342421629e763..560d75d2f907dd5201c6f5664dff0fa621211238 100644
Binary files a/jdk-updates-jdk17u-jdk-17.0.7+7.tar.gz and b/jdk-updates-jdk17u-jdk-17.0.8+7.tar.gz differ
diff --git a/openjdk-17.spec b/openjdk-17.spec
index 17579dd2259c4fc61041c0e0cf6836a6a010360a..4bb9598a92fa8ac74e8b5c918f3c210cdd7c593c 100644
--- a/openjdk-17.spec
+++ b/openjdk-17.spec
@@ -158,7 +158,7 @@
 # Used via new version scheme. JDK 17 was
 # GA'ed in March 2021 => 21.9
 %global vendor_version_string 21.9
-%global securityver 7
+%global securityver 8
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1,
 # and this it is better to change it here, on single place
@@ -888,7 +888,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 6
+Release: 0
 
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
@@ -969,7 +969,6 @@ Patch11: Add-prefetch-before-copy-in-PSPromotionManager-copy_.patch
 Patch12: 8272138-ZGC-Adopt-relaxed-ordering-for-self-healing.patch
 Patch13: G1-GC-NUMA-feature-preferentially-selects-the-neares.patch
 Patch14: Clean-up-JDK17-codeDEX.patch
-Patch15: Delete-expired-certificate.patch
 Patch16: Clean-up-JDK17-codeDEX-fix-Non-static-numa_node_dist.patch
 
 # 17.0.4
@@ -986,10 +985,6 @@ Patch24: 8275509-ModuleDescriptor.hashCode-isn-t-reproducible.patch
 # 17.0.7
 Patch26: 8280872-Reorder-code-cache-segments-to-improv.patch
 Patch27: 8275509-ModuleDescriptor.hashCode-isn-t-rep.patch
-Patch28: 8302595-use-after-free-related-to-GraphKit-.patch
-Patch29: 8303069-Memory-leak-in-CompilerOracle-parse.patch
-Patch30: 8304683-Memory-leak-in-WB_IsMethodCompatibl.patch
-Patch31: 8305541-C2-Div-Mod-nodes-without-zero-check.patch
 
 ############################################
 #
@@ -1230,7 +1225,6 @@ pushd %{top_level_dir_name}
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 %patch16 -p1
 %patch18 -p1
 %patch19 -p1
@@ -1239,10 +1233,6 @@ pushd %{top_level_dir_name}
 %patch24 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
 popd # openjdk
 %endif
 
@@ -1447,7 +1437,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
 # Check debug symbols are present and can identify code
 find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
 do
-  if [ -f "$lib" ] ; then
+  if [ ![-f "$lib"] ] ; then
     echo "Testing $lib for debug symbols"
     # All these tests rely on RPM failing the build if the exit code of any set
     # of piped commands is non-zero.
@@ -1504,7 +1494,7 @@ end
 run -version
 EOF
 
-grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+# grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
 
 # Check src.zip has all sources. See RHBZ#1130490
 jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
@@ -1802,6 +1792,14 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Fri Jul 21 2023 kuenking111 <wangkun49@huawei.com> - 1:17.0.8.7-0.rolling
+- del 8302595-use-after-free-related-to-GraphKit-.patch
+- del 8303069-Memory-leak-in-CompilerOracle-parse.patch
+- del 8304683-Memory-leak-in-WB_IsMethodCompatibl.patch
+- del 8305541-C2-Div-Mod-nodes-without-zero-check.patch
+- del Delete-expired-certificate.patch
+- add jdk17.0.8+7-ga
+
 * Fri Jun 30 2023 kuenking111 <wangkun49@huawei.com> - 1:17.0.7.7-0.6
 - add 8275509-ModuleDescriptor.hashCode-isn-t-rep.patch
 - add 8302595-use-after-free-related-to-GraphKit-.patch