diff --git a/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
index 00f4e026d33..b9f3036f7aa 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/JdkDownloadPlugin.java
@@ -110,12 +110,17 @@ public class JdkDownloadPlugin implements Plugin<Project> {
 
         if (jdk.getVendor().equals(VENDOR_ADOPTIUM)) {
             repoUrl = "https://github.com/adoptium/temurin" + jdk.getMajor() + "-binaries/releases/download/";
+            // JDK updates are suffixed with 'U' (fe OpenJDK17U), whereas GA releases are not (fe OpenJDK17).
+            // To distinguish between those, the GA releases have only major version component (fe 17+32),
+            // the updates always have minor/patch components (fe 17.0.1+12), checking for the presence of
+            // version separator '.' should be enough.
             artifactPattern = "jdk-"
                 + jdk.getBaseVersion()
                 + "+"
                 + jdk.getBuild()
                 + "/OpenJDK"
                 + jdk.getMajor()
+                + (jdk.getBaseVersion().contains(".") ? "U" : "")
                 + "-jdk_[classifier]_[module]_hotspot_"
                 + jdk.getBaseVersion()
                 + "_"
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
index 226875ec3d8..81b51f7f1f9 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
@@ -76,7 +76,7 @@ import java.util.stream.Stream;
 public class DistroTestPlugin implements Plugin<Project> {
     private static final String SYSTEM_JDK_VERSION = "8u242+b08";
     private static final String SYSTEM_JDK_VENDOR = "adoptopenjdk";
-    private static final String GRADLE_JDK_VERSION = "17+35";
+    private static final String GRADLE_JDK_VERSION = "17.0.1+12";
     private static final String GRADLE_JDK_VENDOR = "adoptium";
 
     // all distributions used by distro tests. this is temporary until tests are per distribution
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 32570c5c881..4c1217d251d 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -2,7 +2,7 @@ opensearch        = 2.0.0
 lucene            = 8.10.1
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 17+35
+bundled_jdk = 17.0.1+12
 
 checkstyle = 8.29