diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
index 07f1124..48551de 100644
--- a/.github/actions/run-tests/action.yml
+++ b/.github/actions/run-tests/action.yml
@@ -10,7 +10,7 @@ inputs:
     default: 'false'
   databroker-version:
     description: "Databroker Version"
-    default: 'main'
+    default: 'latest'
   kotest-tag:
     description: >
       The Kotest Tag to use when executing the tests. Check Tag.kt for valid options. Different Tags might require the
@@ -23,10 +23,9 @@ runs:
     - name: Run 'test' with Gradle Wrapper
       run: ./gradlew test -Ddatabroker.tag="${{ inputs.databroker-version }}" -Dkotest.tags="${{ inputs['kotest-tag'] }}" -Ddatabroker.timeout=30
       shell: bash
-      continue-on-error: true
 
     - name: Upload Test Reports
-      if: ${{ inputs['upload-test-reports'] == 'true' }}
+      if: ${{ always() && inputs['upload-test-reports'] == 'true' }}
       uses: actions/upload-artifact@v4
       with:
         name: test-reports
diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/DataBrokerDockerContainer.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/DataBrokerDockerContainer.kt
index b6bac25..34cd146 100644
--- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/DataBrokerDockerContainer.kt
+++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/DataBrokerDockerContainer.kt
@@ -22,7 +22,6 @@ package org.eclipse.kuksa.connectivity.databroker.docker
 import com.github.dockerjava.api.DockerClient
 import com.github.dockerjava.api.command.CreateContainerResponse
 import com.github.dockerjava.api.command.PullImageResultCallback
-import com.github.dockerjava.api.command.WaitContainerResultCallback
 import com.github.dockerjava.api.exception.NotModifiedException
 import com.github.dockerjava.api.model.AccessMode
 import com.github.dockerjava.api.model.Bind
@@ -168,10 +167,6 @@ abstract class DataBrokerDockerContainer(
     private fun startContainer(containerId: String) {
         try {
             dockerClient.startContainerCmd(containerId).exec()
-
-            dockerClient.waitContainerCmd(containerId)
-                .exec(WaitContainerResultCallback())
-                .awaitCompletion(timeout.toLong(), TimeUnit.SECONDS)
         } catch (_: NotModifiedException) {
             // thrown when a container is already started
         }
diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/InsecureDataBrokerDockerContainer.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/InsecureDataBrokerDockerContainer.kt
index 840b8c1..50b5807 100644
--- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/InsecureDataBrokerDockerContainer.kt
+++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/InsecureDataBrokerDockerContainer.kt
@@ -20,6 +20,8 @@
 package org.eclipse.kuksa.connectivity.databroker.docker
 
 import com.github.dockerjava.api.command.CreateContainerResponse
+import com.github.dockerjava.api.model.ExposedPort
+import com.github.dockerjava.api.model.InternetProtocol
 
 // no tls, no authentication
 class InsecureDataBrokerDockerContainer(
@@ -31,7 +33,9 @@ class InsecureDataBrokerDockerContainer(
         return dockerClient.createContainerCmd("$repository:$tag")
             .withName("${containerName}_${System.nanoTime()}")
             .withHostConfig(hostConfig)
+            .withExposedPorts(ExposedPort(port, InternetProtocol.TCP))
             .withCmd(
+                "--address", "0.0.0.0",
                 "--port", "$port",
                 "--insecure",
                 "--vss", vssMount,
diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt
index 739993e..35fcdcc 100644
--- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt
+++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt
@@ -22,7 +22,9 @@ package org.eclipse.kuksa.connectivity.databroker.docker
 import com.github.dockerjava.api.command.CreateContainerResponse
 import com.github.dockerjava.api.model.AccessMode
 import com.github.dockerjava.api.model.Bind
+import com.github.dockerjava.api.model.ExposedPort
 import com.github.dockerjava.api.model.HostConfig
+import com.github.dockerjava.api.model.InternetProtocol
 import com.github.dockerjava.api.model.Volume
 import org.eclipse.kuksa.test.TestResourceFile
 
@@ -49,7 +51,9 @@ class SecureDataBrokerDockerContainer(
         return dockerClient.createContainerCmd("$repository:$tag")
             .withName("${containerName}_${System.nanoTime()}")
             .withHostConfig(hostConfig)
+            .withExposedPorts(ExposedPort(port, InternetProtocol.TCP))
             .withCmd(
+                "--address", "0.0.0.0",
                 "--port", "$port",
                 "--tls-cert", "$tlsMount/Server.pem",
                 "--tls-private-key", "$tlsMount/Server.key",