diff --git a/README.md b/README.md
index 6184f74..9ddd613 100644
--- a/README.md
+++ b/README.md
@@ -196,9 +196,19 @@ If your extension is not starting and throwing some error like no JDK found even
 The extension will analyze the content of the opened workspace, and relevant other files. If the workspace contains a lot of data, this may take a long time. It is therefore recommended to avoid adding unnecessarily big folders in a workspace. Specifically, it is not recommended to open user's home directory as a part of the workspace.
 
 ## Known Issue
-If an action has been applied to the Maven `pom.xml` file through the extension, such as enabling a preview feature or adding a test runner framework, subsequent compile or run operations may fail. To resolve this issue, please follow the steps below:
-1. Check the `pom.xml` file for any duplicated tags.
-2. If duplicated tags are found, remove the extra tags and attempt to compile again.
+1. If an action has been applied to the Maven `pom.xml` file through the extension, such as enabling a preview feature or adding a test runner framework, subsequent compile or run operations may fail. To resolve this issue, please follow the steps below:
+    1. Check the `pom.xml` file for any duplicated tags.
+    2. If duplicated tags are found, remove the extra tags and attempt to compile again.
+    3. Add the `--enable-preview` VM argument to the *exec-maven-plugin* or *maven-surefile-plugin* configurations if they are used execution or test runs.
+2. If the "*Launch Java App*" configuration is being used to *Run and Debug* an application, the following issues may occur if no `mainClass` field value is defined.
+    - Issues:
+        1. If more than 2 main classes are present in the project, then using the *Run and Debug* button does not launch execution and appears as stuck prior to run.
+        2. If the editor window open is a file that is not within the src root of the maven/gradle project, then using the *Run and Debug* button launches the projects tests.
+    - Resolution or Workaround:
+        1. Open the `launch.json` file.
+        2. Edit the configuration for the "*Launch Java App*", i.e. the one which has `"type": "jdk"` and `"request": "launch"`.
+        3. Define a value for the *mainClass* field, i.e. `"mainClass": "<main class fully-qualified-name or file-path>"`.
+3. The *Project: Test Project* command executes the project's tests but does not update the Testing or the Tests Results panels. The test output is present only in the Terminal or Debug Console panel.
 
 ## Telemetry
 
diff --git a/vscode/CHANGELOG.md b/vscode/CHANGELOG.md
index b7c3bc3..fadfe1d 100644
--- a/vscode/CHANGELOG.md
+++ b/vscode/CHANGELOG.md
@@ -37,6 +37,7 @@
 
 #### Other Changes
 * Updated openjdk24 URL to 24.0.2 [#442](https://github.com/oracle/javavscode/pull/442)
+* Updated openjdk25 URL to 25 [#465](https://github.com/oracle/javavscode/pull/465)
 
 **Full Changelog**: https://github.com/oracle/javavscode/compare/v24.1.0...v24.1.1
 
diff --git a/vscode/src/constants.ts b/vscode/src/constants.ts
index 08e0c9d..0e1789c 100644
--- a/vscode/src/constants.ts
+++ b/vscode/src/constants.ts
@@ -31,10 +31,10 @@ export namespace jdkDownloaderConstants {
 
   export const ORACLE_JDK_BASE_DOWNLOAD_URL = `https://download.oracle.com/java`;
 
-  export const ORACLE_JDK_FALLBACK_VESIONS = ['24', '21'];
+  export const ORACLE_JDK_FALLBACK_VESIONS = ['25', '21'];
 
   export const OPEN_JDK_VERSION_DOWNLOAD_LINKS: { [key: string]: string } = {
-    "24": "https://download.java.net/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2"
+    "25": "https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25"
   };  
 }
 export const NODE_WINDOWS_LABEL = "Windows_NT";