diff --git a/dist/setup/index.js b/dist/setup/index.js
index 6047db22..124909eb 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -3936,7 +3936,7 @@ class JavaBase {
             const cleanVersion = semver_1.default.clean(version);
             return `${cleanVersion}-ea`;
         }
-        return version.replace('+', '_');
+        return version.replace('+', '-');
     }
     findInToolcache() {
         // we can't use tc.find directly because firstly, we need to filter versions by stability flag
@@ -3946,7 +3946,7 @@ class JavaBase {
             .filter(item => item.endsWith('-ea') === !this.stable);
         console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
         const satisfiedVersions = availableVersions
-            .filter(item => util_1.isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+')))
+            .filter(item => util_1.isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('-', '+')))
             .sort(semver_1.default.rcompare);
         if (!satisfiedVersions || satisfiedVersions.length === 0) {
             return null;
diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts
index c5b83129..6489065c 100644
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -63,7 +63,7 @@ export abstract class JavaBase {
       const cleanVersion = semver.clean(version);
       return `${cleanVersion}-ea`;
     }
-    return version.replace('+', '_');
+    return version.replace('+', '-');
   }
 
   protected findInToolcache(): JavaInstallerResults | null {
@@ -76,7 +76,7 @@ export abstract class JavaBase {
     console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
 
     const satisfiedVersions = availableVersions
-      .filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('_', '+')))
+      .filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('-', '+')))
       .sort(semver.rcompare);
     if (!satisfiedVersions || satisfiedVersions.length === 0) {
       return null;