diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
index adcc0dbf7..0cd94c956 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
@@ -242,13 +242,15 @@ public class SpringBootApp {
 	}
 
 	public String getAutoConfigReport() throws Exception {
+		//Boot 1.x
 		Object result = getActuatorDataFromAttribute("org.springframework.boot:type=Endpoint,name=autoConfigurationReportEndpoint", "Data");
 		if (result != null) {
 			String report = new ObjectMapper().writeValueAsString(result);
 			return report;
 		}
 
-		result = getActuatorDataFromOperation("org.springframework.boot:type=Endpoint,name=Conditions", "getEvaluationReport");
+		//Boot 2.x
+		result = getActuatorDataFromOperation("org.springframework.boot:type=Endpoint,name=Conditions", "applicationConditionEvaluation");
 		if (result != null) {
 			String report = new ObjectMapper().writeValueAsString(result);
 			return report;
diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
index 50e069b33..3f6d397d9 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java
@@ -117,7 +117,7 @@ public class LiveBeansModel {
 		public LiveBeansModel parse(String json) throws Exception {
 			Builder model = LiveBeansModel.builder();
 			JSONObject mainObject = new JSONObject(json);
-			JSONObject beansObject = mainObject.getJSONObject("beans");
+			JSONObject beansObject = getBeans(mainObject);
 			for (String id : beansObject.keySet()) {
 				JSONObject beanObject = beansObject.getJSONObject(id);
 				LiveBean bean = parseBean(id, beanObject);
@@ -128,6 +128,14 @@ public class LiveBeansModel {
 			return model.build();
 		}
 
+		private JSONObject getBeans(JSONObject mainObject) {
+			JSONObject beans = mainObject.optJSONObject("beans");
+			if (beans==null) {
+				beans = mainObject.getJSONObject("contexts").getJSONObject("application").getJSONObject("beans");
+			}
+			return beans;
+		}
+
 		private LiveBean parseBean(String id, JSONObject beansJSON) {
 			String type = beansJSON.optString("type");
 			String scope = beansJSON.optString("scope");
diff --git a/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar b/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar
index ee9bc07d2..a6620c482 100644
Binary files a/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar and b/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar differ