diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
index 8ca6934ed7..9193895f6e 100644
--- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.28.0",
  org.eclipse.equinox.registry;bundle-version="3.11.300",
  org.eclipse.equinox.security,
  org.eclipse.osgi,
- org.mandas.docker-client;bundle-version="7.0.7",
+ org.mandas.docker-client;bundle-version="10.0.0",
  org.glassfish.jersey.core.jersey-client;bundle-version="3.1.5",
  org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="3.1.5",
  org.glassfish.jersey.core.jersey-common;bundle-version="3.1.5",
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
index fd08883010..2de695ee77 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
@@ -69,19 +69,22 @@ public DockerClient getClient(
 			final IDockerConnectionSettings connectionSettings,
 			final IRegistryAccount registryAccount)
 			throws DockerCertificateException {
-		final DockerClientBuilder builder = DockerClientBuilder.fromEnv()
-				.uri((URI) null);
+		final DockerClientBuilder builder = DockerClientBuilder.fromEnv();
 		if (connectionSettings
 				.getType() == BindingType.UNIX_SOCKET_CONNECTION) {
 			final UnixSocketConnectionSettings unixSocketConnectionSettings = (UnixSocketConnectionSettings) connectionSettings;
 			if (unixSocketConnectionSettings.hasPath()) {
-				builder.uri(unixSocketConnectionSettings.getPath());
+				String path = unixSocketConnectionSettings.getPath();
+				builder.uri(path);
+			} else {
+				return null;
 			}
 
 		} else {
 			final TCPConnectionSettings tcpConnectionSettings = (TCPConnectionSettings) connectionSettings;
 			if (tcpConnectionSettings.hasHost()) {
-				builder.uri(URI.create(tcpConnectionSettings.getHost()));
+				String host = tcpConnectionSettings.getHost();
+				builder.uri(URI.create(host));
 				if (tcpConnectionSettings.getPathToCertificates() != null
 						&& !tcpConnectionSettings.getPathToCertificates()
 								.isEmpty()) {
@@ -89,12 +92,10 @@ public DockerClient getClient(
 							tcpConnectionSettings.getPathToCertificates())
 									.toPath()));
 				}
+			} else {
+				return null;
 			}
 		}
-		// skip if no URI exists
-		if (builder.uri() == null) {
-			return null;
-		}
 
 		if (registryAccount != null) {
 			// mimic spotify:
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/TCPConnectionSettings.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/TCPConnectionSettings.java
index e8f4db0982..9c832c6981 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/TCPConnectionSettings.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/TCPConnectionSettings.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Red Hat.
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -44,7 +44,7 @@ public class TCPConnectionSettings extends BaseConnectionSettings {
 
 	/**
 	 * Constructor
-	 * 
+	 *
 	 * @param host
 	 *            host to connect to
 	 * @param pathToCertificates
@@ -53,7 +53,11 @@ public class TCPConnectionSettings extends BaseConnectionSettings {
 	public TCPConnectionSettings(final String host,
 			final String pathToCertificates) {
 		super();
-		this.host = new HostBuilder(host).enableTLS(pathToCertificates);
+		if (host != null) {
+			this.host = new HostBuilder(host).enableTLS(pathToCertificates);
+		} else {
+			this.host = null;
+		}
 		this.pathToCertificates = pathToCertificates;
 	}
 
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
index cf19788716..9187bd3bb5 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target
@@ -266,7 +266,7 @@
 			<dependency>
 				<groupId>org.mandas</groupId>
 				<artifactId>docker-client</artifactId>
-				<version>9.0.4</version>
+				<version>10.0.0</version>
 				<type>jar</type>
 			</dependency>
 		</dependencies>