diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java
index 53e9fbc..e662e9c 100644
--- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java
+++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java
@@ -46,7 +46,7 @@ public void resetToken() {
   }
 
   private TokenResponse retrieveToken() {
-    try (CloseableHttpClient client = HttpClients.createDefault()) {
+    try (CloseableHttpClient client = HttpClients.createSystem()) {
       HttpPost request = buildRequest();
       return client.execute(
           request,
diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java
index 9854bf1..39c30c5 100644
--- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java
+++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/SimpleAuthentication.java
@@ -28,7 +28,7 @@ public SimpleAuthentication(SimpleCredential simpleCredential) {
   }
 
   private SimpleAuthToken retrieveToken() {
-    try (CloseableHttpClient client = HttpClients.createDefault()) {
+    try (CloseableHttpClient client = HttpClients.createSystem()) {
       HttpPost request = buildRequest(simpleCredential);
       SimpleAuthToken simpleAuthToken =
           client.execute(
diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java
index 45e2a23..3be58bb 100644
--- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java
+++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java
@@ -57,7 +57,7 @@ public CamundaOperateClientConfiguration operateClientConfiguration(
   @Bean("operateHttpClient")
   @ConditionalOnMissingBean(name = "operateHttpClient")
   public CloseableHttpClient operateHttpClient() {
-    return HttpClients.createDefault();
+    return HttpClients.createSystem();
   }
 
   @Bean