diff --git a/Launcher/runtime/config.js b/Launcher/runtime/config.js
index 89bdd1e..17b7520 100644
--- a/Launcher/runtime/config.js
+++ b/Launcher/runtime/config.js
@@ -13,17 +13,7 @@
     settingsMagic: 0xC0DE5, // Ancient magic, don't touch
     autoEnterDefault: false, // Should autoEnter be enabled by default?
     fullScreenDefault: false, // Should fullScreen be enabled by default?
-    ramDefault: 1024, // Default RAM amount (0 for auto)
-
-    // Custom JRE config (!!! DON'T CHANGE !!!)
-    jvmMustdie32Dir: "jre-8u282-win32", jvmMustdie64Dir: "jre-8u282-win64",
-    jvmLinux32Dir: "jre-8u282-linux32", jvmLinux64Dir: "jre-8u282-linux64",
-    jvmMacOSXDir: "jre-8u282-macosx", jvmUnknownDir: "jre-8u282-unknown"
-
-    // Custom JRE config (!!! DON'T CHANGE !!!)
-    //jvmMustdie32Dir: "jre-17-full-win32", jvmMustdie64Dir: "jre-17-full-win64",
-    //jvmLinux32Dir: "jre-17-full-linux32", jvmLinux64Dir: "jre-17-full-linux64",
-    //jvmMacOSXDir: "jre-17-full-macosx", jvmUnknownDir: "jre-17-full-unknown"
+    ramDefault: 1024 // Default RAM amount (0 for auto)
 };
 
 // ====== DON'T TOUCH! ====== //
diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index dafd79b..079bd29 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -172,9 +172,10 @@
 
     // Update JVM dir
     update.resetOverlay("Обновление файлов JVM");
+    var jvmCustomDir = profile.object.block.getEntryValue("jvmVersion", StringConfigEntryClass) + jvmDirName;
     overlay.swap(0, update.overlay, function(event) {
-        var jvmDir = settings.updatesDir.resolve(jvmDirName);
-        makeUpdateRequest(jvmDirName, jvmDir, null, digest, function(jvmHDir) {
+        var jvmDir = settings.updatesDir.resolve(jvmCustomDir);
+        makeUpdateRequest(jvmCustomDir, jvmDir, null, digest, function(jvmHDir) {
             settings.lastHDirs.put(jvmDirName, jvmHDir);
 
             // Update asset dir
diff --git a/Launcher/runtime/init.js b/Launcher/runtime/init.js
index 678978b..8bb921f 100644
--- a/Launcher/runtime/init.js
+++ b/Launcher/runtime/init.js
@@ -57,12 +57,12 @@
     // Set JVM dir name
     LogHelper.debug("Setting JVM dir name");
     switch (JVMHelper.OS_TYPE) {
-        case JVMHelperOS.MUSTDIE: jvmDirName = JVMHelper.OS_BITS === 32 ? config.jvmMustdie32Dir : // 32-bit Mustdie
-            jvmDirName = JVMHelper.OS_BITS === 64 ? config.jvmMustdie64Dir : config.jvmUnknownDir; break; // 64-bit Mustdie
-        case JVMHelperOS.LINUX: jvmDirName = JVMHelper.OS_BITS === 32 ? config.jvmLinux32Dir : // 32-bit Linux
-            jvmDirName = JVMHelper.OS_BITS === 64 ? config.jvmLinux64Dir : config.jvmUnknownDir; break; // 64-bit Linux
-        case JVMHelperOS.MACOSX: jvmDirName = JVMHelper.OS_BITS === 64 ? config.jvmMacOSXDir : config.jvmUnknownDir; break; // 64-bit MacOSX
-        default: jvmDirName = config.jvmUnknownDir; LogHelper.warning("Unknown OS: '%s'", JVMHelper.OS_TYPE.name); break; // Unknown OS
+        case JVMHelperOS.MUSTDIE: jvmDirName = JVMHelper.OS_BITS === 32 ? "-win32" : // 32-bit Mustdie
+            jvmDirName = JVMHelper.OS_BITS === 64 ? "-win64" : "-unknown"; break; // 64-bit Mustdie
+        case JVMHelperOS.LINUX: jvmDirName = JVMHelper.OS_BITS === 32 ? "-linux32" : // 32-bit Linux
+            jvmDirName = JVMHelper.OS_BITS === 64 ? "-linux64" : "-unknown"; break; // 64-bit Linux
+        case JVMHelperOS.MACOSX: jvmDirName = JVMHelper.OS_BITS === 64 ? "-macosx" : "-unknown"; break; // 64-bit MacOSX
+        default: jvmDirName = "-unknown"; LogHelper.warning("Unknown OS: '%s'", JVMHelper.OS_TYPE.name); break; // Unknown OS
     }
 
     // Set font rendering properties
diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java
index cfa9b07..bfe320e 100644
--- a/Launcher/source/client/ClientProfile.java
+++ b/Launcher/source/client/ClientProfile.java
@@ -30,6 +30,7 @@
     private final StringConfigEntry title;
     private final StringConfigEntry serverAddress;
     private final IntegerConfigEntry serverPort;
+    private final StringConfigEntry jvmVersion;
 
     //  Updater and client watch service
     private final ListConfigEntry update;
@@ -57,6 +58,7 @@
         title = block.getEntry("title", StringConfigEntry.class);
         serverAddress = block.getEntry("serverAddress", StringConfigEntry.class);
         serverPort = block.getEntry("serverPort", IntegerConfigEntry.class);
+        jvmVersion = block.getEntry("jvmVersion", StringConfigEntry.class);
 
         //  Updater and client watch service
         update = block.getEntry("update", ListConfigEntry.class);
@@ -129,6 +131,11 @@
     }
 
     @LauncherAPI
+    public String getJvmVersion() {
+        return jvmVersion.getValue() == null ? "";
+    }
+
+    @LauncherAPI
     public String[] getJvmArgs()
     {
         return jvmArgs.stream(StringConfigEntry.class).toArray(String[]::new);
diff --git a/buildnumber b/buildnumber
index 5c580d7..29e11ee 100644
--- a/buildnumber
+++ b/buildnumber
@@ -1 +1 @@
-585, 27.01.2022
\ No newline at end of file
+586, 27.01.2022
\ No newline at end of file