diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
index 2c005e88f24..985426736a9 100644
--- a/clients/java/client/pom.xml
+++ b/clients/java/client/pom.xml
@@ -18,11 +18,11 @@
     <tomcat.runtime>${engine.runtime}/server/apache-tomcat-${version.tomcat}</tomcat.runtime>
     <http.port>${tomcat.connector.http.port}</http.port>
 
-    <tomcat.connector.http.port>50080</tomcat.connector.http.port>
-    <tomcat.connector.http.redirectPort>50443</tomcat.connector.http.redirectPort>
-    <tomcat.connector.ajp.port>50009</tomcat.connector.ajp.port>
-    <tomcat.connector.ajp.redirectPort>50443</tomcat.connector.ajp.redirectPort>
-    <tomcat.server.port>50005</tomcat.server.port>
+    <tomcat.connector.http.port>48080</tomcat.connector.http.port>
+    <tomcat.connector.http.redirectPort>48443</tomcat.connector.http.redirectPort>
+    <tomcat.connector.ajp.port>48009</tomcat.connector.ajp.port>
+    <tomcat.connector.ajp.redirectPort>48443</tomcat.connector.ajp.redirectPort>
+    <tomcat.server.port>48005</tomcat.server.port>
 
     <cargo.timeout>240000</cargo.timeout>
     <cargo.deploy.timeout>60000</cargo.deploy.timeout>
diff --git a/clients/java/client/src/it/resources/integration-rules.properties b/clients/java/client/src/it/resources/integration-rules.properties
index 648a27cfb50..6e77f3bedfc 100644
--- a/clients/java/client/src/it/resources/integration-rules.properties
+++ b/clients/java/client/src/it/resources/integration-rules.properties
@@ -1,3 +1,3 @@
 #for tests internal usage only
-camunda.engine.rest=http://localhost:50080/engine-rest
+camunda.engine.rest=http://localhost:48080/engine-rest
 camunda.engine.name=/engine/default
\ No newline at end of file
diff --git a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunDeploymentConfiguration.java b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunDeploymentConfiguration.java
index 23fd58492ce..8cac04fe3b8 100644
--- a/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunDeploymentConfiguration.java
+++ b/distro/run/core/src/main/java/org/camunda/bpm/run/CamundaBpmRunDeploymentConfiguration.java
@@ -56,6 +56,11 @@ public Set<Resource> getDeploymentResources() {
   protected String getNormalizedDeploymentDir() {
     String result = deploymentDir;
 
+    // deploymentDir can be null if code is run by not using the start script (e.g. for tests)
+    if(result == null) {
+      return null;
+    }
+
     if(File.separator.equals("\\")) {
       result = result.replace("\\", "/");
     }
diff --git a/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
index 25f71b49480..78bb02ca9b7 100644
--- a/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
+++ b/distro/run/core/src/test/java/org/camunda/bpm/run/test/config/https/HttpsConfigurationEnabledTest.java
@@ -67,7 +67,7 @@ public void shouldNotRedirect() {
 
     // then
     exceptionRule.expect(ResourceAccessException.class);
-    exceptionRule.expectMessage("Connection refused");
+    exceptionRule.expectMessage("I/O error on GET request for \"http://localhost:8080/engine-rest/task\":");
 
     // then
     ResponseEntity<String> response = testRestTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null), String.class);
diff --git a/distro/run/core/src/test/resources/application-test-https-enabled.yml b/distro/run/core/src/test/resources/application-test-https-enabled.yml
index e63e9f9714c..77758d4d48b 100644
--- a/distro/run/core/src/test/resources/application-test-https-enabled.yml
+++ b/distro/run/core/src/test/resources/application-test-https-enabled.yml
@@ -5,4 +5,5 @@ server:
     key-store-type: pkcs12
     key-alias: camunda
     key-password: camunda
-  port: 8443
\ No newline at end of file
+  port: 8443
+spring.http.client.factory: simple
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index ff2c5c2fba2..16b623e702f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -20,8 +20,8 @@
   <properties>
     <version.quarkus>3.15.0</version.quarkus>
     <version.spring.framework>5.3.39</version.spring.framework>
-    <version.spring.framework6>6.1.15</version.spring.framework6>
-    <version.spring-boot>3.3.6</version.spring-boot>
+    <version.spring.framework6>6.2.0</version.spring.framework6>
+    <version.spring-boot>3.4.0</version.spring-boot>
     <version.resteasy>3.15.6.Final</version.resteasy>
     <version.jersey2>2.34</version.jersey2>
     <!-- use minimum version of resteasy and jersey -->
@@ -43,7 +43,7 @@
     <version.xml.jaxb-impl4>4.0.5</version.xml.jaxb-impl4>
     <version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
     <version.httpclient>4.5.14</version.httpclient>
-    <version.httpclient5>5.3</version.httpclient5>
+    <version.httpclient5>5.4.1</version.httpclient5>
 
     <version.slf4j>1.7.26</version.slf4j>
     <version.logback>1.2.11</version.logback>