diff --git a/gulpfile.js b/gulpfile.js
index e34d7103..e7192498 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,7 @@ const download = require("gulp-download2");
 const cp = require("child_process");
 
 const libertyGroupId = "io.openliberty.tools";
-const libertyVersion = "2.1.1";
+const libertyVersion = "2.2";
 const jakartaGroupId = "org.eclipse.lsp4jakarta";
 const jakartaVersion = "0.2.1";
 var releaseLevel = "releases";  //"snapshots"; //snapshots or releases
diff --git a/package.json b/package.json
index 71c69e79..57614d07 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
 			"./jars/org.eclipse.lsp4jakarta.jdt.core-0.2.1.jar"
 		],
 		"xml.javaExtensions": [
-			"./jars/liberty-langserver-lemminx-2.1.1-jar-with-dependencies.jar"
+			"./jars/liberty-langserver-lemminx-2.2-jar-with-dependencies.jar"
 		],
 		"views": {
 			"explorer": [
diff --git a/src/extension.ts b/src/extension.ts
index 2d6a189b..a609f5f9 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -22,7 +22,7 @@ import { prepareExecutable } from "./util/javaServerStarter";
 
 const LIBERTY_CLIENT_ID = "LANGUAGE_ID_LIBERTY";
 const JAKARTA_CLIENT_ID = "LANGUAGE_ID_JAKARTA";
-export const LIBERTY_LS_JAR = "liberty-langserver-2.1.1-jar-with-dependencies.jar";
+export const LIBERTY_LS_JAR = "liberty-langserver-2.2-jar-with-dependencies.jar";
 export const JAKARTA_LS_JAR = "org.eclipse.lsp4jakarta.ls-0.2.1-jar-with-dependencies.jar";
 
 let libertyClient: LanguageClient;
diff --git a/src/liberty/devCommands.ts b/src/liberty/devCommands.ts
index 456fbea9..c76740be 100644
--- a/src/liberty/devCommands.ts
+++ b/src/liberty/devCommands.ts
@@ -490,7 +490,8 @@ export async function openReport(reportType: string, libProject?: LibertyProject
         if (path !== undefined) {
             let report: any;
             if (libProject.getContextValue() === LIBERTY_MAVEN_PROJECT || libProject.getContextValue() === LIBERTY_MAVEN_PROJECT_CONTAINER) {
-                report = Path.join(path, "target", "site", reportType + "-report.html");
+                //report = Path.join(path, "target", "site", reportType + "-report.html");
+                report = getReportFile(path,"reports",reportType+".html");
             } else if (libProject.getContextValue() === LIBERTY_GRADLE_PROJECT || libProject.getContextValue() === LIBERTY_GRADLE_PROJECT_CONTAINER) {
                 report = await getGradleTestReport(libProject.path, path);
             }
@@ -498,20 +499,20 @@ export async function openReport(reportType: string, libProject?: LibertyProject
             if (reportType === "gradle") {
                 reportTypeLabel = "test";
             }
-            fs.exists(report, (exists) => {
-                if (exists) {
-                    const panel = vscode.window.createWebviewPanel(
-                        reportType, // Identifies the type of the webview. Used internally
-                        libProject.getLabel() + " " + reportTypeLabel + " report", // Title of the panel displayed to the user
-                        vscode.ViewColumn.Two, // Open the panel in the second window
-                        {}, // Webview options
-                    );
-                    panel.webview.html = getReport(report); // display HTML content
-                } else {
-                    const message = localize("test.report.does.not.exist.run.test.first", report);
-                    vscode.window.showInformationMessage(message);
+            if(libProject.getContextValue() === LIBERTY_MAVEN_PROJECT || libProject.getContextValue() === LIBERTY_MAVEN_PROJECT_CONTAINER){
+                console.log("report path ::"+report)
+                if(!await checkReportExists(report,reportType,reportTypeLabel,libProject)){
+                    report = getReportFile(path,"site",reportType+"-report.html");
+                    if(!await checkReportExists(report,reportType,reportTypeLabel,libProject)){
+                        const message = localize("test.report.does.not.exist.run.test.first", report);
+                        vscode.window.showInformationMessage(message);
+                    }     
                 }
-            });
+            }else if(!await checkReportExists(report,reportType,reportTypeLabel,libProject)){
+                        const message = localize("test.report.does.not.exist.run.test.first", report);
+                        vscode.window.showInformationMessage(message);
+                    }
+
         }
     } else if (ProjectProvider.getInstance() && reportType) {
         showProjects(reportType, openReport, reportType);
@@ -610,4 +611,32 @@ async function getLocalGradleWrapper(projectFolder: string): Promise<string | un
  */
 function isWin(): boolean {
     return process.platform.startsWith("win");
-}
\ No newline at end of file
+}
+
+function getReportFile(path :any,dir :string,filename:string):any{
+    console.log("inside getReportFile path::"+path+"::dir::"+dir+"::fileName::"+filename);
+    console.log("::path::"+Path.join(path,"target",dir,filename));
+    return Path.join(path,"target",dir, filename);
+}
+
+/*
+Function will check if the report is available within the given path and returns a boolean based on it and also 
+  the report will be displayed if it is available
+*/
+function checkReportExists(report : any,reportType : string,reportTypeLabel: string,libProject :LibertyProject): Promise<boolean> {
+    return new Promise((resolve) => {
+      fs.exists(report, (exists) => {
+        if(exists){
+            const panel = vscode.window.createWebviewPanel(
+                reportType, // Identifies the type of the webview. Used internally
+                libProject.getLabel() + " " + reportTypeLabel + " report", // Title of the panel displayed to the user
+                vscode.ViewColumn.Two, // Open the panel in the second window
+                {}, // Webview options
+            );
+            panel.webview.html = getReport(report); // display HTML content
+        }
+        console.log("report available::"+exists);
+        resolve(exists);
+      });
+    });
+  }
\ No newline at end of file
diff --git a/src/test/MavenTestDevModeActions.ts b/src/test/MavenTestDevModeActions.ts
index 5e34c8f6..86c20765 100755
--- a/src/test/MavenTestDevModeActions.ts
+++ b/src/test/MavenTestDevModeActions.ts
@@ -99,8 +99,10 @@ it('Run tests for sample maven project', async () => {
 it('start maven with options from liberty dashboard', async () => {      
     
   const reportPath = path.join(utils.getMvnProjectPath(),"target","site","failsafe-report.html");
-  const deleteReport = await utils.deleteReports(reportPath);
-  expect (deleteReport).to.be.true;
+  const reportPath35 = path.join(utils.getMvnProjectPath(),"target","reports","failsafe.html");
+  let deleteReport = await utils.deleteReports(reportPath);
+  let deleteReport35 = await utils.deleteReports(reportPath35);
+  expect (deleteReport||deleteReport35).to.be.true;
   await utils.launchDashboardAction(item, constants.START_DASHBOARD_ACTION_WITH_PARAM, constants.START_DASHBOARD_MAC_ACTION_WITH_PARAM);
   await utils.setCustomParameter("-DhotTests=true");  
   await utils.delay(30000);  
@@ -111,7 +113,8 @@ it('start maven with options from liberty dashboard', async () => {
   {
     console.log("Server succuessfully started");  
     let checkFile = await utils.checkIfTestReportExists(reportPath);
-    expect (checkFile).to.be.true;
+    let checkFile35 = await utils.checkIfTestReportExists(reportPath35);
+    expect (checkFile || checkFile35).to.be.true;
     await utils.launchDashboardAction(item, constants.STOP_DASHBOARD_ACTION, constants.STOP_DASHBOARD_MAC_ACTION);    
     const serverStopStatus= await utils.checkTerminalforServerState(constants.SERVER_STOP_STRING);
     if(!serverStopStatus){ 
@@ -129,8 +132,10 @@ it('start maven with options from liberty dashboard', async () => {
 it('start maven with history from liberty dashboard', async () => {  
 
   const reportPath = path.join(utils.getMvnProjectPath(),"target","site","failsafe-report.html");
-  const deleteReport = await utils.deleteReports(reportPath);
-  expect (deleteReport).to.be.true;  
+  const reportPath35 = path.join(utils.getMvnProjectPath(),"target","reports","failsafe.html");
+  let deleteReport = await utils.deleteReports(reportPath);
+  let deleteReport35 = await utils.deleteReports(reportPath35);
+  expect (deleteReport || deleteReport35).to.be.true;  
   await utils.launchDashboardAction(item, constants.START_DASHBOARD_ACTION_WITH_PARAM, constants.START_DASHBOARD_MAC_ACTION_WITH_PARAM);  
   const foundCommand = await utils.chooseCmdFromHistory("-DhotTests=true");
   expect (foundCommand).to.be.true;  
@@ -142,7 +147,8 @@ it('start maven with history from liberty dashboard', async () => {
   {
     console.log("Server succuessfully started");  
     let checkFile = await utils.checkIfTestReportExists(reportPath);
-    expect (checkFile).to.be.true;
+    let checkFile35 = await utils.checkIfTestReportExists(reportPath35);
+    expect (checkFile || checkFile35).to.be.true;
     await utils.launchDashboardAction(item, constants.STOP_DASHBOARD_ACTION, constants.STOP_DASHBOARD_MAC_ACTION);    
     const serverStopStatus= await utils.checkTerminalforServerState(constants.SERVER_STOP_STRING);
     if(!serverStopStatus){