diff --git a/dist/setup/index.js b/dist/setup/index.js
index 01d5f674..2b6d6c14 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -124231,9 +124231,10 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
                 }
                 // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
                 // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-                if (jdkVersion.split('.').length > 3) {
-                    jdkVersion = (0, util_1.convertVersionToSemver)(jdkVersion);
-                }
+                const jdkVersionNums = jdkVersion
+                    .replace('+', '.')
+                    .split('.');
+                jdkVersion = (0, util_1.convertVersionToSemver)(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
                 for (const edition in archMap) {
                     eligibleVersions.push({
                         os: platform,