diff --git a/0592661e480dd108a708689dc56bf1a427677645.zip b/0592661e480dd108a708689dc56bf1a427677645.zip
deleted file mode 100644
index e92044b..0000000
--- a/0592661e480dd108a708689dc56bf1a427677645.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:936e49975f7990da8caef9c13c8e95f61ebb90a0b23682409cec8dcb75a67633
-size 28634469
diff --git a/77b0f75480594444eb7fb47bf37d3aae6d8135ef.zip b/77b0f75480594444eb7fb47bf37d3aae6d8135ef.zip
new file mode 100644
index 0000000..460deb1
--- /dev/null
+++ b/77b0f75480594444eb7fb47bf37d3aae6d8135ef.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2314973a68dcbc995ab7b348c8dace6e6d0cd42eb006622a6a7c8297f571392d
+size 168540640
diff --git a/927b34f84c8c5ff380df16f2df8dd84a44b8c79e.zip b/927b34f84c8c5ff380df16f2df8dd84a44b8c79e.zip
deleted file mode 100644
index ee90b5e..0000000
--- a/927b34f84c8c5ff380df16f2df8dd84a44b8c79e.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:665cc6ac90e2724a1c9f3c3afc56c44c1e18f67dec7257e2a49453fb11624994
-size 167653399
diff --git a/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip b/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip
new file mode 100644
index 0000000..03bfceb
--- /dev/null
+++ b/d12d10c9ea2de2cf363095e609536ffe451bd25f.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb0732120798ec4b83139cb7567aa9547cb03c046e4d4ccfd30d0c153a07a220
+size 29039092
diff --git a/e80bff83b7fda8875071d89de7c73184d847085d.zip b/e80bff83b7fda8875071d89de7c73184d847085d.zip
new file mode 100644
index 0000000..79170b3
--- /dev/null
+++ b/e80bff83b7fda8875071d89de7c73184d847085d.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3e7e7e10b60c25a8ae52a2dbc6c57812d68f9196c527332b509a0acbe1d03ab
+size 11073241
diff --git a/f491bbf6f6f3f87bfd38a65055589125c13de555.zip b/f491bbf6f6f3f87bfd38a65055589125c13de555.zip
deleted file mode 100644
index 326e199..0000000
--- a/f491bbf6f6f3f87bfd38a65055589125c13de555.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9360df92a5a55b8a7af85f04f68aa1ecb9bb9928fce9e578636f203d233a175
-size 11062092
diff --git a/java-17-openj9.changes b/java-17-openj9.changes
index f77de80..fb9c902 100644
--- a/java-17-openj9.changes
+++ b/java-17-openj9.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 14 19:58:17 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 17.0.7 with OpenJ9 0.38.0 virtual machine
+- Including Oracle April 2023 CPU changes
+  * CVE-2023-21930 (bsc#1210628), CVE-2023-21937 (bsc#1210631),
+    CVE-2023-21938 (bsc#1210632), CVE-2023-21939 (bsc#1210634),
+    CVE-2023-21954 (bsc#1210635), CVE-2023-21967 (bsc#1210636),
+    CVE-2023-21968 (bsc#1210637)
+  * OpenJ9 specific vulnerability: CVE-2023-2597 (bsc#1211615)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.38
+
 -------------------------------------------------------------------
 Tue Mar 28 10:02:44 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-17-openj9.spec b/java-17-openj9.spec
index bdfdf4f..be1d217 100644
--- a/java-17-openj9.spec
+++ b/java-17-openj9.spec
@@ -29,18 +29,18 @@
 # Standard JPackage naming and versioning defines.
 %global featurever      17
 %global interimver      0
-%global updatever       6
-%global buildver        10
+%global updatever       8
+%global buildver        7
 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
-%global root_revision   927b34f84c8c5ff380df16f2df8dd84a44b8c79e
-%global root_branch     v0.36.0-release
+%global root_revision   77b0f75480594444eb7fb47bf37d3aae6d8135ef
+%global root_branch     v0.40.0-release
 %global omr_repository  https://github.com/eclipse/openj9-omr/archive
-%global omr_revision    f491bbf6f6f3f87bfd38a65055589125c13de555
-%global omr_branch      v0.36.1-release
+%global omr_revision    e80bff83b7fda8875071d89de7c73184d847085d
+%global omr_branch      v0.40.0-release
 %global openj9_repository https://github.com/eclipse/openj9/archive
-%global openj9_revision 0592661e480dd108a708689dc56bf1a427677645
-%global openj9_branch   v0.36.1-release
-%global openj9_tag      openj9-0.36.1
+%global openj9_revision d12d10c9ea2de2cf363095e609536ffe451bd25f
+%global openj9_branch   v0.40.0-release
+%global openj9_tag      openj9-0.40.0
 # priority must be 6 digits in total
 %if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
 %global priority        2701
diff --git a/stringop-overflow.patch b/stringop-overflow.patch
index 3f0a6a3..1e79fb3 100644
--- a/stringop-overflow.patch
+++ b/stringop-overflow.patch
@@ -9,9 +9,9 @@ diff -urEbwB openj9-openjdk-jdk17.orig/omr/compiler/optimizer/OMRSimplifierHandl
 +#pragma GCC diagnostic ignored "-Wstringop-overflow"
 +
  #include "optimizer/OMRSimplifierHelpers.hpp"
- #include "optimizer/OMRSimplifierHandlers.hpp"
+ #include "optimizer/SimplifierHandlers.hpp"
  
-@@ -17404,5 +17407,6 @@
+@@ -17353,5 +17356,6 @@
     return node;
     }