diff --git a/headless-services/boot-java-language-server/pom.xml b/headless-services/boot-java-language-server/pom.xml
index 33a4cf809..82386667b 100644
--- a/headless-services/boot-java-language-server/pom.xml
+++ b/headless-services/boot-java-language-server/pom.xml
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-metadata</artifactId>
-			<version>1.5.1.RELEASE</version>
+			<version>1.5.8.RELEASE</version>
 		</dependency>
 
 		<!-- Test harness -->
@@ -118,7 +118,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.4.1.RELEASE</version>
+				<version>1.5.8.RELEASE</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/headless-services/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml
index 34be25c49..b1b179b9d 100644
--- a/headless-services/commons/commons-gradle/pom.xml
+++ b/headless-services/commons/commons-gradle/pom.xml
@@ -14,7 +14,7 @@
 	</parent>
 
 	<properties>
-		<gradle-tooling.version>3.3</gradle-tooling.version>
+		<gradle-tooling.version>4.3</gradle-tooling.version>
 	</properties>
 
 	<repositories>
diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
index b49c0158f..c4e9fde1a 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
@@ -11,6 +11,7 @@
 package org.springframework.ide.vscode.commons.gradle;
 
 import java.io.File;
+import java.net.URI;
 import java.util.concurrent.TimeUnit;
 
 import org.gradle.tooling.GradleConnectionException;
@@ -20,6 +21,7 @@ import org.gradle.tooling.internal.consumer.DefaultGradleConnector;
 import org.gradle.tooling.model.build.BuildEnvironment;
 import org.gradle.tooling.model.eclipse.EclipseProject;
 import org.springframework.ide.vscode.commons.util.Assert;
+import org.springframework.ide.vscode.commons.util.Log;
 
 /**
  * Gradle API tooling utility
@@ -72,9 +74,12 @@ public class GradleCore {
 			 */
 			((DefaultGradleConnector) gradleConnector).daemonMaxIdleTime(1, TimeUnit.SECONDS);
 			configuration.configure(gradleConnector);
+			// Use patched Gradle 4.3 distribution as a workaround for https://github.com/gradle/gradle/issues/2483
+			gradleConnector.useDistribution(URI.create("http://s3-test.spring.io/sts4/custom-gradle-builds/gradle-4.3-build.zip"));
 			connection = gradleConnector.connect();
 			return connection.getModel(modelType);
 		} catch (GradleConnectionException e) {
+			Log.log(e);
 			throw new GradleException(e);
 		} finally {
 			if (connection != null) {