diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerRunTargetType.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerRunTargetType.java
index 81b64ddca..d99424edf 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerRunTargetType.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/src/org/springframework/ide/eclipse/boot/dash/docker/runtarget/DockerRunTargetType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Pivotal, Inc.
+ * Copyright (c) 2020, 2021 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,6 @@ import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.transport.DockerHttpClient;
-import com.github.dockerjava.zerodep.ConnectionPoolConfig;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 
 public class DockerRunTargetType extends AbstractRemoteRunTargetType<DockerTargetParams> {
@@ -85,9 +84,7 @@ public class DockerRunTargetType extends AbstractRemoteRunTargetType<DockerTarge
 		DockerHttpClient httpClient = new ZerodepDockerHttpClient.Builder()
 				.dockerHost(conf.getDockerHost())
 				.sslConfig(conf.getSSLConfig())
-				.connectionPool(new ConnectionPoolConfig()
-						.setMaxConnections(200)
-				)
+				.maxConnections(200)
 				.build();
 		return DockerClientImpl.getInstance(conf, httpClient);
 	}
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.classpath b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.classpath
index 4e1b69c29..3fc07fcf4 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.classpath
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.classpath
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="dependency/bcpkix-jdk15on-1.64.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/bcprov-jdk15on-1.64.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/commons-compress-1.20.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/commons-io-2.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/commons-lang-2.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/jackson-annotations-2.11.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/jackson-core-2.11.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/jackson-databind-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/jna-5.5.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/slf4j-api-1.7.30.jar"/>
 	<classpathentry exported="true" kind="lib" path="dependency/slf4j-simple-1.7.30.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/docker-java-api-99.99.99-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/docker-java-core-99.99.99-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-99.99.99-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/commons-compress-1.21.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/jna-5.8.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/docker-java-api-3.2.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/docker-java-core-3.2.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-3.2.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="dependency/docker-java-transport-zerodep-3.2.12.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.settings/org.eclipse.jdt.core.prefs b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.settings/org.eclipse.jdt.core.prefs
index 9f6ece88b..7adc0fb9a 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/META-INF/MANIFEST.MF
index 1f8438544..751ac0661 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/META-INF/MANIFEST.MF
@@ -4,23 +4,23 @@ Bundle-Name: org.springframework.ide.eclipse.docker.client.wrapper
 Bundle-SymbolicName: org.springframework.ide.eclipse.docker.client;singleton:=true
 Bundle-Version: 4.12.1.qualifier
 Automatic-Module-Name: org.springframework.ide.eclipse.docker.client.wrapper
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
  dependency/bcpkix-jdk15on-1.64.jar,
  dependency/bcprov-jdk15on-1.64.jar,
- dependency/commons-compress-1.20.jar,
+ dependency/commons-compress-1.21.jar,
  dependency/commons-io-2.6.jar,
  dependency/commons-lang-2.6.jar,
  dependency/jackson-annotations-2.11.2.jar,
  dependency/jackson-core-2.11.2.jar,
  dependency/jackson-databind-2.11.2.jar,
- dependency/jna-5.5.0.jar,
+ dependency/jna-5.8.0.jar,
  dependency/slf4j-api-1.7.30.jar,
  dependency/slf4j-simple-1.7.30.jar,
- dependency/docker-java-api-99.99.99-SNAPSHOT.jar,
- dependency/docker-java-core-99.99.99-SNAPSHOT.jar,
- dependency/docker-java-transport-99.99.99-SNAPSHOT.jar,
- dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar
+ dependency/docker-java-api-3.2.12.jar,
+ dependency/docker-java-core-3.2.12.jar,
+ dependency/docker-java-transport-3.2.12.jar,
+ dependency/docker-java-transport-zerodep-3.2.12.jar
 Export-Package: com.github.dockerjava.api,
  com.github.dockerjava.api.async,
  com.github.dockerjava.api.command,
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/build.properties b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/build.properties
index 787f0d9be..ee37f86a2 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/build.properties
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/build.properties
@@ -5,16 +5,16 @@ bin.includes = META-INF/,\
                dependency/,\
                dependency/bcpkix-jdk15on-1.64.jar,\
                dependency/bcprov-jdk15on-1.64.jar,\
-               dependency/commons-compress-1.20.jar,\
+               dependency/commons-compress-1.21.jar,\
                dependency/commons-io-2.6.jar,\
                dependency/commons-lang-2.6.jar,\
                dependency/guava-19.0.jar,\
                dependency/jackson-annotations-2.11.2.jar,\
                dependency/jackson-core-2.11.2.jar,\
                dependency/jackson-databind-2.11.2.jar,\
-               dependency/jna-5.5.0.jar,\
+               dependency/jna-5.8.0.jar,\
                dependency/slf4j-api-1.7.30.jar,\
-               dependency/docker-java-api-99.99.99-SNAPSHOT.jar,\
-               dependency/docker-java-core-99.99.99-SNAPSHOT.jar,\
-               dependency/docker-java-transport-99.99.99-SNAPSHOT.jar,\
-               dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar
+               dependency/docker-java-api-3.2.12.jar,\
+               dependency/docker-java-core-3.2.12.jar,\
+               dependency/docker-java-transport-3.2.12.jar,\
+               dependency/docker-java-transport-zerodep-3.2.12.jar
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.20.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.20.jar
deleted file mode 100644
index 17c1c7b45..000000000
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.20.jar and /dev/null differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.21.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.21.jar
new file mode 100644
index 000000000..4892334d0
Binary files /dev/null and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/commons-compress-1.21.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-3.2.12.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-3.2.12.jar
new file mode 100644
index 000000000..afa3ac1c6
Binary files /dev/null and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-3.2.12.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-99.99.99-SNAPSHOT.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-99.99.99-SNAPSHOT.jar
deleted file mode 100644
index 0cd5abf34..000000000
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-api-99.99.99-SNAPSHOT.jar and /dev/null differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-99.99.99-SNAPSHOT.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-3.2.12.jar
similarity index 71%
rename from eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-99.99.99-SNAPSHOT.jar
rename to eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-3.2.12.jar
index ff56e1f62..3e729448b 100644
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-99.99.99-SNAPSHOT.jar and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-core-3.2.12.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-3.2.12.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-3.2.12.jar
new file mode 100644
index 000000000..710e1dc6d
Binary files /dev/null and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-3.2.12.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-99.99.99-SNAPSHOT.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-99.99.99-SNAPSHOT.jar
deleted file mode 100644
index 367101a09..000000000
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-99.99.99-SNAPSHOT.jar and /dev/null differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-3.2.12.jar
similarity index 60%
rename from eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar
rename to eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-3.2.12.jar
index 87c1d45d0..da37a2e5b 100644
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-99.99.99-SNAPSHOT.jar and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/docker-java-transport-zerodep-3.2.12.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.5.0.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.5.0.jar
deleted file mode 100644
index ff423c8f3..000000000
Binary files a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.5.0.jar and /dev/null differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.8.0.jar b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.8.0.jar
new file mode 100644
index 000000000..c3d534c1d
Binary files /dev/null and b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/dependency/jna-5.8.0.jar differ
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/pom.xml b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/pom.xml
index 58d65bdcf..a48c3f1e2 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/pom.xml
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/pom.xml
@@ -22,12 +22,12 @@
 		<dependency>
 			<groupId>com.github.docker-java</groupId>
 			<artifactId>docker-java-core</artifactId>
-			<version>3.2.6-SNAPSHOT</version>
+			<version>3.2.12</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.docker-java</groupId>
 			<artifactId>docker-java-transport-zerodep</artifactId>
-			<version>3.2.6-SNAPSHOT</version>
+			<version>3.2.12</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/src/main/java/com/example/demo/DockerClientWrapperApplication.java b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/src/main/java/com/example/demo/DockerClientWrapperApplication.java
index 1a2716d6a..554c8f7d6 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/src/main/java/com/example/demo/DockerClientWrapperApplication.java
+++ b/eclipse-extensions/org.springframework.ide.eclipse.docker.client/docker-client-wrapper/src/main/java/com/example/demo/DockerClientWrapperApplication.java
@@ -7,7 +7,7 @@ import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.transport.DockerHttpClient;
-import com.github.dockerjava.zerodep.ConnectionPoolConfig;
+//import com.github.dockerjava.zerodep.ConnectionPoolConfig;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 
 public class DockerClientWrapperApplication {
@@ -28,11 +28,11 @@ public class DockerClientWrapperApplication {
 			System.out.println(image.getId());
 		}
 		
-		if (httpClient instanceof ConnectionPoolConfig) {
-			ConnectionPoolConfig cp = (ConnectionPoolConfig) httpClient;
-			System.out.println("max = " +cp.getPoolSizeMax());
-			System.out.println("max per route = "+cp.getPoolSizeDefaultMaxPerRoute());
-		}
+//		if (httpClient instanceof ConnectionPoolConfig) {
+//			ConnectionPoolConfig cp = (ConnectionPoolConfig) httpClient;
+//			System.out.println("max = " +cp.getPoolSizeMax());
+//			System.out.println("max per route = "+cp.getPoolSizeDefaultMaxPerRoute());
+//		}
 
 	}