diff --git a/__tests__/distributors/openjdk-installer.test.ts b/__tests__/distributors/openjdk-installer.test.ts
index 5c47f218..b2799e61 100644
--- a/__tests__/distributors/openjdk-installer.test.ts
+++ b/__tests__/distributors/openjdk-installer.test.ts
@@ -176,12 +176,13 @@ describe('OpenJdkDistribution', () => {
       'x64'
     );
     const windowsRelease = distribution['parseReleases'](
-      '<a href="https://download.java.net/java/GA/jdk10/hash/13/GPL/openjdk-10_windows-x64_bin.tar.gz">tar.gz</a>',
+      '<a href="https://download.java.net/java/GA/jdk10/hash/13/openjdk-10.0.2_windows-x64_bin.tar.gz">tar.gz</a>',
       'windows',
       'x64'
     );
 
     expect(macRelease[0].version).toBe('16.0.0+7');
+    expect(windowsRelease[0].version).toBe('10.0.2+13');
     expect(windowsRelease[0].url.endsWith('.tar.gz')).toBe(true);
   });
 
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 55831b10..269d760f 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -131939,7 +131939,7 @@ class OpenJdkDistribution extends JavaBase {
         const pattern = new RegExp(`href="(https://download\\.java\\.net/[^"]+/openjdk-([^"_]+)_${platformPattern}-${arch}_bin\\.${extensionPattern})"`, 'g');
         return Array.from(html.matchAll(pattern), match => {
             const url = match[1];
-            const build = url.match(/\/(\d+)\/GPL\/openjdk-/)?.[1];
+            const build = url.match(/\/(\d+)\/(?:GPL\/)?openjdk-/)?.[1];
             return {
                 version: this.toSemver(match[2], build),
                 url
diff --git a/src/distributions/openjdk/installer.ts b/src/distributions/openjdk/installer.ts
index 21b4f7f7..5776cddc 100644
--- a/src/distributions/openjdk/installer.ts
+++ b/src/distributions/openjdk/installer.ts
@@ -126,7 +126,7 @@ export class OpenJdkDistribution extends JavaBase {
 
     return Array.from(html.matchAll(pattern), match => {
       const url = match[1];
-      const build = url.match(/\/(\d+)\/GPL\/openjdk-/)?.[1];
+      const build = url.match(/\/(\d+)\/(?:GPL\/)?openjdk-/)?.[1];
       return {
         version: this.toSemver(match[2], build),
         url