You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cl...@apache.org on 2025/08/04 16:54:10 UTC

(camel) branch main updated: CAMEL-22265 camel-jbang infra run: Set the container name to a fixed name (#18702) (#18816)

This is an automated email from the ASF dual-hosted git repository.

claudio4j pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 0d305ea72f2 CAMEL-22265 camel-jbang infra run: Set the container name to a fixed name (#18702) (#18816)
0d305ea72f2 is described below

commit 0d305ea72f2d1a89e5dc45a2944b2a16d17672fe
Author: Claudio Miranda <cl...@claudius.com.br>
AuthorDate: Mon Aug 4 17:54:04 2025 +0100

    CAMEL-22265 camel-jbang infra run: Set the container name to a fixed name (#18702) (#18816)
    
    https://issues.apache.org/jira/browse/CAMEL-22265
---
 .../integration/MongoDbFindOperationIT.java        | 18 +----
 .../component/smb/SmbComponentConnectionIT.java    |  2 +-
 .../apache/camel/component/smb/SmbComponentIT.java |  2 +-
 .../camel/component/smb/SmbServerTestSupport.java  |  2 +-
 .../ArangoDBLocalContainerInfraService.java        |  4 ++
 .../artemis/services/ArtemisAllInfraService.java   |  5 ++
 .../services/AWSLocalContainerInfraService.java    |  6 +-
 .../common/services/AzureStorageInfraService.java  |  4 ++
 .../azure/common/services/AzuriteContainer.java    |  8 ---
 .../CassandraLocalContainerInfraService.java       |  9 ++-
 .../ChatScriptLocalContainerInfraService.java      | 11 ++-
 .../common/services/ContainerEnvironmentUtil.java  | 30 +++++++-
 .../CouchbaseLocalContainerInfraService.java       |  5 ++
 .../CouchDbLocalContainerInfraService.java         | 14 ++--
 .../couchdb/services/CouchDbServiceFactory.java    |  2 +-
 .../ElasticSearchLocalContainerInfraService.java   |  4 ++
 .../services/FhirLocalContainerInfraService.java   | 14 ++--
 .../GooglePubSubLocalContainerInfraService.java    |  4 ++
 .../HashicorpVaultLocalContainerInfraService.java  | 12 ++--
 .../services/AbstractLocalHiveMQService.java       |  5 ++
 .../hivemq/services/LocalHiveMQInfraService.java   |  6 +-
 .../LocalHiveMQSparkplugTCKInfraService.java       |  2 +-
 .../InfinispanLocalContainerInfraService.java      | 12 ++--
 .../services/ContainerLocalKafkaInfraService.java  |  8 +++
 .../infra/kafka/services/RedpandaInfraService.java |  5 ++
 .../infra/kafka/services/StrimziContainer.java     |  1 -
 .../infra/kafka/services/StrimziInfraService.java  |  5 ++
 .../test/infra/kafka/services/container.properties |  1 +
 .../MicroprofileLRALocalContainerInfraService.java | 14 ++--
 .../services/MilvusLocalContainerInfraService.java |  4 ++
 .../services/MinioLocalContainerInfraService.java  | 14 ++--
 .../MongoDBLocalContainerInfraService.java         | 15 ++--
 .../MosquittoLocalContainerInfraService.java       | 19 ++---
 .../services/NatsLocalContainerInfraService.java   | 12 ++--
 .../services/OllamaLocalContainerInfraService.java |  5 +-
 .../OpenldapLocalContainerInfraService.java        |  4 ++
 .../PostgresLocalContainerInfraService.java        | 14 ++--
 .../services/PulsarLocalContainerInfraService.java |  4 ++
 .../services/QdrantLocalContainerInfraService.java |  4 ++
 .../RabbitMQLocalContainerInfraService.java        |  4 ++
 .../services/RedisLocalContainerInfraService.java  |  8 +++
 .../rocketmq/services/RocketMQBrokerContainer.java |  1 -
 .../services/RocketMQContainerInfraService.java    |  4 ++
 .../services/SmbLocalContainerInfraService.java    | 16 ++++-
 .../test/infra/smb/services/SmbServiceFactory.java | 81 +++++++++++++++-------
 .../services/SolrLocalContainerInfraService.java   |  4 ++
 .../TorchServeLocalContainerInfraService.java      |  4 ++
 .../services/XmppLocalContainerInfraService.java   |  4 ++
 .../ZooKeeperLocalContainerInfraService.java       |  5 ++
 49 files changed, 320 insertions(+), 121 deletions(-)

diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
index 7d4f26e964b..503a95037fe 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
@@ -32,7 +32,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mongodb.MongoDbComponent;
 import org.apache.camel.component.mongodb.MongoDbConstants;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.infra.mongodb.services.MongoDBLocalContainerService;
+import org.apache.camel.test.infra.mongodb.services.MongoDBService;
+import org.apache.camel.test.infra.mongodb.services.MongoDBServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
 import org.apache.commons.lang3.ObjectUtils;
@@ -43,7 +44,6 @@ import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.containers.wait.strategy.Wait;
 
 import static com.mongodb.client.model.Filters.eq;
 import static org.apache.camel.component.mongodb.MongoDbConstants.MONGO_ID;
@@ -57,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class MongoDbFindOperationIT extends CamelTestSupport {
 
     @RegisterExtension
-    public static MongoDBLocalContainerService service;
+    public static MongoDBService service = MongoDBServiceFactory.createSingletonService();
 
     protected static String dbName = "test";
     protected static String testCollectionName;
@@ -66,18 +66,6 @@ public class MongoDbFindOperationIT extends CamelTestSupport {
     private static MongoDatabase db;
     private static MongoCollection<Document> testCollection;
 
-    static {
-        service = new MongoDBLocalContainerService();
-
-        service.getContainer()
-                .waitingFor(Wait.forListeningPort())
-                .withCommand(
-                        "--replSet", "replicationName",
-                        "--oplogSize", "5000",
-                        "--syncdelay", "0",
-                        "--noauth");
-    }
-
     @Override
     public void doPreSetup() throws Exception {
         super.doPreSetup();
diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
index b61217a0b5d..56fbfb672ca 100644
--- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
+++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
@@ -40,7 +40,7 @@ public class SmbComponentConnectionIT extends CamelTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(SmbComponentIT.class);
 
     @RegisterExtension
-    public static SmbService service = SmbServiceFactory.createService();
+    public static SmbService service = SmbServiceFactory.createSingletonService();
 
     @EndpointInject("mock:result")
     protected MockEndpoint mockResultEndpoint;
diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java
index 457c2380c88..1df64f28b19 100644
--- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java
+++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentIT.java
@@ -39,7 +39,7 @@ public class SmbComponentIT extends CamelTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(SmbComponentIT.class);
 
     @RegisterExtension
-    public static SmbService service = SmbServiceFactory.createService();
+    public static SmbService service = SmbServiceFactory.createSingletonService();
 
     @EndpointInject("mock:result")
     protected MockEndpoint mockResultEndpoint;
diff --git a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java
index cee82c2e96c..e77c7c34326 100644
--- a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java
+++ b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbServerTestSupport.java
@@ -36,7 +36,7 @@ public abstract class SmbServerTestSupport extends CamelTestSupport {
 
     // docker container shared by all tests using this service
     @RegisterExtension
-    public static SmbService service = SmbServiceFactory.createService();
+    public static SmbService service = SmbServiceFactory.createSingletonService();
 
     public byte[] copyFileContentFromContainer(String fileName) {
         return service.copyFileFromContainer(fileName, IOUtils::toByteArray);
diff --git a/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
index 94ae09edbd5..555231e0259 100644
--- a/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
@@ -39,6 +39,10 @@ public class ArangoDBLocalContainerInfraService implements ArangoDBInfraService,
 
     public ArangoDBLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public ArangoDBLocalContainerInfraService(ArangoDbContainer container) {
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
index ceb6ff9e06c..3426db9d8ea 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.artemis.services;
 
 import org.apache.activemq.artemis.core.server.QueueQueryResult;
 import org.apache.camel.spi.annotations.InfraService;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +33,10 @@ public class ArtemisAllInfraService implements ArtemisInfraService, ContainerSer
 
     public ArtemisAllInfraService() {
         container = initContainer();
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     protected ArtemisContainer initContainer() {
diff --git a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
index 9b5960917cf..474dbf5d5a0 100644
--- a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
@@ -24,6 +24,7 @@ import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.AWSProperties;
 import org.apache.camel.test.infra.aws.common.services.AWSInfraService;
 import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +45,10 @@ public abstract class AWSLocalContainerInfraService implements AWSInfraService,
 
     public AWSLocalContainerInfraService(String imageName, Service... services) {
         container = initContainer(imageName);
-
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
         container.setupServices(services);
     }
 
diff --git a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
index 734c08a6711..9576b26b9b9 100644
--- a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
+++ b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
@@ -35,6 +35,10 @@ public abstract class AzureStorageInfraService implements AzureInfraService, Con
 
     public AzureStorageInfraService(String imageName) {
         this.container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public AzureStorageInfraService(AzuriteContainer container) {
diff --git a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
index db835b84d1e..4c3bfe6fe5d 100644
--- a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
+++ b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
@@ -18,8 +18,6 @@
 package org.apache.camel.test.infra.azure.common.services;
 
 import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
-import org.apache.camel.test.infra.azure.common.AzureProperties;
-import org.apache.camel.test.infra.common.LocalPropertyResolver;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -28,12 +26,6 @@ public class AzuriteContainer extends GenericContainer<AzuriteContainer> {
     public static final String DEFAULT_ACCOUNT_KEY
             = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
 
-    public AzuriteContainer() {
-        LocalPropertyResolver.getProperty(
-                AzuriteContainer.class,
-                AzureProperties.AZURE_CONTAINER);
-    }
-
     public AzuriteContainer(String containerName, boolean fixedPort) {
         super(containerName);
 
diff --git a/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
index 3ea58423dc7..9379a167f3a 100644
--- a/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
@@ -19,10 +19,11 @@ package org.apache.camel.test.infra.cassandra.services;
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.cassandra.common.CassandraProperties;
 import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.cassandra.CassandraContainer;
 import org.testcontainers.utility.DockerImageName;
 
 /**
@@ -44,6 +45,10 @@ public class CassandraLocalContainerInfraService implements CassandraInfraServic
 
     public CassandraLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(CassandraLocalContainerInfraService.this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public CassandraLocalContainerInfraService(CassandraContainer container) {
@@ -71,7 +76,7 @@ public class CassandraLocalContainerInfraService implements CassandraInfraServic
 
     @Override
     public int port() {
-        return container.getMappedPort(CassandraContainer.CQL_PORT);
+        return container.getContactPoint().getPort();
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
index f799c222440..67cfa359820 100644
--- a/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.infra.chatscript.services;
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.chatscript.common.ChatScriptProperties;
 import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +28,10 @@ import org.testcontainers.containers.GenericContainer;
 @InfraService(service = ChatScriptInfraService.class,
               description = "ChatBot Engine",
               serviceAlias = "chat-script")
-public class ChatScriptLocalContainerInfraService implements ChatScriptInfraService, ContainerService<GenericContainer> {
+public class ChatScriptLocalContainerInfraService implements ChatScriptInfraService, ContainerService<GenericContainer<?>> {
     private static final Logger LOG = LoggerFactory.getLogger(ChatScriptLocalContainerInfraService.class);
     private static final int SERVICE_PORT = 1024;
-    private GenericContainer container;
+    private GenericContainer<?> container;
 
     public ChatScriptLocalContainerInfraService() {
         String containerName = LocalPropertyResolver.getProperty(
@@ -40,6 +41,10 @@ public class ChatScriptLocalContainerInfraService implements ChatScriptInfraServ
         container = new GenericContainer<>(containerName)
                 .withExposedPorts(SERVICE_PORT)
                 .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withTty(true));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
@@ -63,7 +68,7 @@ public class ChatScriptLocalContainerInfraService implements ChatScriptInfraServ
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
index b5b79920c32..f143fd4468d 100644
--- a/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
+++ b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
@@ -17,6 +17,7 @@
 
 package org.apache.camel.test.infra.common.services;
 
+import org.apache.camel.spi.annotations.InfraService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -57,7 +58,7 @@ public final class ContainerEnvironmentUtil {
         container.setStartupAttempts(startupAttempts);
     }
 
-    public static boolean isFixedPort(Class cls) {
+    public static boolean isFixedPort(@SuppressWarnings("rawtypes") Class cls) {
         for (Class<?> i : cls.getInterfaces()) {
             if (i.getName().contains("InfraService")) {
                 return true;
@@ -66,4 +67,31 @@ public final class ContainerEnvironmentUtil {
 
         return false;
     }
+
+    public static String containerName(Class cls) {
+        InfraService annotation = findAnnotation(cls);
+        String name = null;
+        if (annotation != null) {
+            name = "camel-" + annotation.serviceAlias()[0];
+            if (annotation.serviceImplementationAlias().length > 0) {
+                name += "-" + annotation.serviceImplementationAlias()[0];
+            }
+        } else {
+            LOG.warn("InfraService annotation not Found to determine container name alias.");
+        }
+        return name;
+    }
+
+    private static InfraService findAnnotation(Class cls) {
+        InfraService annotation = (InfraService) cls.getAnnotation(InfraService.class);
+        Class targetClass = cls;
+        while (annotation == null && targetClass.getSuperclass() != null) {
+            targetClass = targetClass.getSuperclass();
+            annotation = (InfraService) targetClass.getAnnotation(InfraService.class);
+            if (annotation != null) {
+                break;
+            }
+        }
+        return annotation;
+    }
 }
diff --git a/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
index f49b258cbe8..5a7159d650a 100644
--- a/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
@@ -27,6 +27,7 @@ import com.couchbase.client.java.manager.view.View;
 import com.couchbase.client.java.view.DesignDocumentNamespace;
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.test.infra.couchbase.common.CouchbaseProperties;
 import org.slf4j.Logger;
@@ -77,6 +78,10 @@ public class CouchbaseLocalContainerInfraService implements CouchbaseInfraServic
 
     public CouchbaseLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public CouchbaseLocalContainerInfraService(CouchbaseContainer container) {
diff --git a/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
index fc0445a6b26..b5123d5e99d 100644
--- a/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
@@ -30,12 +30,12 @@ import org.testcontainers.utility.DockerImageName;
 @InfraService(service = CouchDbInfraService.class,
               description = "SQL Clustered database CouchDB",
               serviceAlias = { "couchdb" })
-public class CouchDbLocalContainerInfraService implements CouchDbInfraService, ContainerService<GenericContainer> {
+public class CouchDbLocalContainerInfraService implements CouchDbInfraService, ContainerService<GenericContainer<?>> {
     public static final String CONTAINER_NAME = "couchdb";
 
     private static final Logger LOG = LoggerFactory.getLogger(CouchDbLocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public CouchDbLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(
@@ -45,13 +45,17 @@ public class CouchDbLocalContainerInfraService implements CouchDbInfraService, C
 
     public CouchDbLocalContainerInfraService(String imageName) {
         container = initContainer(imageName, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public CouchDbLocalContainerInfraService(GenericContainer container) {
+    public CouchDbLocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
         class CouchDBContainer extends GenericContainer<CouchDBContainer> {
             public CouchDBContainer(boolean fixedPort) {
                 super(DockerImageName.parse(imageName));
@@ -92,7 +96,7 @@ public class CouchDbLocalContainerInfraService implements CouchDbInfraService, C
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java b/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java
index 07e41c30ac7..08e152faf8e 100644
--- a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java
+++ b/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbServiceFactory.java
@@ -46,7 +46,7 @@ public final class CouchDbServiceFactory {
     }
 
     public static SimpleTestServiceBuilder<CouchDbService> builder() {
-        return new SimpleTestServiceBuilder<>("consul");
+        return new SimpleTestServiceBuilder<>("couchdb");
     }
 
     public static CouchDbService createService() {
diff --git a/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
index 7c06c159579..d3e5fd2258e 100644
--- a/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
@@ -58,6 +58,10 @@ public class ElasticSearchLocalContainerInfraService
 
     public ElasticSearchLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public ElasticSearchLocalContainerInfraService(ElasticsearchContainer container) {
diff --git a/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
index cc235f46fcd..0c786ad3510 100644
--- a/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
@@ -31,13 +31,13 @@ import org.testcontainers.containers.wait.strategy.Wait;
 @InfraService(service = FhirInfraService.class,
               description = "HAPI FHIR RESTful test server",
               serviceAlias = { "fhir" })
-public class FhirLocalContainerInfraService implements FhirInfraService, ContainerService<GenericContainer> {
+public class FhirLocalContainerInfraService implements FhirInfraService, ContainerService<GenericContainer<?>> {
     // needs https://github.com/hapifhir/hapi-fhir-jpaserver-starter/commit/54120f374eea5084634830d34c99a9137b22a310
     public static final String CONTAINER_NAME = "fhir";
 
     private static final Logger LOG = LoggerFactory.getLogger(FhirLocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public FhirLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(
@@ -47,13 +47,17 @@ public class FhirLocalContainerInfraService implements FhirInfraService, Contain
 
     public FhirLocalContainerInfraService(String imageName) {
         container = initContainer(imageName, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public FhirLocalContainerInfraService(GenericContainer container) {
+    public FhirLocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
         class FhirContainer extends GenericContainer<FhirContainer> {
             public FhirContainer(boolean fixedPort) {
                 super(imageName);
@@ -99,7 +103,7 @@ public class FhirLocalContainerInfraService implements FhirInfraService, Contain
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
index 9d51f4e8c03..ee86a4e6a00 100644
--- a/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
@@ -52,6 +52,10 @@ public class GooglePubSubLocalContainerInfraService
 
     public GooglePubSubLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public GooglePubSubLocalContainerInfraService(PubSubEmulatorContainer container) {
diff --git a/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
index ec1cb7c24a3..e565799e753 100644
--- a/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
@@ -58,7 +58,7 @@ public class HashicorpVaultLocalContainerInfraService
 
     private static final Logger LOG = LoggerFactory.getLogger(HashicorpVaultLocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public HashicorpVaultLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(
@@ -68,13 +68,17 @@ public class HashicorpVaultLocalContainerInfraService
 
     public HashicorpVaultLocalContainerInfraService(String containerImage) {
         container = initContainer(containerImage, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public HashicorpVaultLocalContainerInfraService(GenericContainer container) {
+    public HashicorpVaultLocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
         final Logger containerLog = LoggerFactory.getLogger("container." + containerName);
         final Consumer<OutputFrame> logConsumer = new Slf4jLogConsumer(containerLog);
 
@@ -127,7 +131,7 @@ public class HashicorpVaultLocalContainerInfraService
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
index 3c26b81665f..4da2589da90 100644
--- a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
+++ b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.test.infra.hivemq.services;
 
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.test.infra.hivemq.common.HiveMQProperties;
 import org.slf4j.Logger;
@@ -39,6 +40,10 @@ public abstract class AbstractLocalHiveMQService<T extends AbstractLocalHiveMQSe
         container = initContainer(imageName)
                 .withExposedPorts(MQTT_PORT_DEFAULT, WEBSOCKET_PORT_DEFAULT)
                 .waitingFor(Wait.forListeningPort());
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
index 8901f311aed..7a5e818c74d 100644
--- a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
+++ b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
@@ -27,11 +27,13 @@ import org.testcontainers.utility.DockerImageName;
               serviceAlias = "hive-mq")
 public class LocalHiveMQInfraService extends AbstractLocalHiveMQService<LocalHiveMQInfraService> {
 
-    LocalHiveMQInfraService() {
+    public LocalHiveMQInfraService() {
         super(LocalPropertyResolver.getProperty(LocalHiveMQInfraService.class, HiveMQProperties.HIVEMQ_CONTAINER));
     }
 
     protected HiveMQContainer initContainer(String imageName) {
-        return new HiveMQContainer(DockerImageName.parse(imageName));
+        return new HiveMQContainer(
+                DockerImageName.parse(imageName)
+                        .asCompatibleSubstituteFor("hivemq/hivemq-ce"));
     }
 }
diff --git a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
index f441e77c397..f00eae2e4c9 100644
--- a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
+++ b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
@@ -30,7 +30,7 @@ import org.testcontainers.utility.DockerImageName;
               serviceImplementationAlias = "sparkplug")
 public class LocalHiveMQSparkplugTCKInfraService extends AbstractLocalHiveMQService<LocalHiveMQSparkplugTCKInfraService> {
 
-    LocalHiveMQSparkplugTCKInfraService() {
+    public LocalHiveMQSparkplugTCKInfraService() {
         super(LocalPropertyResolver.getProperty(LocalHiveMQSparkplugTCKInfraService.class,
                 HiveMQProperties.HIVEMQ_SPARKPLUG_CONTAINER));
     }
diff --git a/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
index 036d6cf21be..d5a30434258 100644
--- a/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
@@ -41,7 +41,7 @@ public class InfinispanLocalContainerInfraService implements InfinispanInfraServ
 
     private static final Logger LOG = LoggerFactory.getLogger(InfinispanLocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
     private final boolean isNetworkHost;
 
     public InfinispanLocalContainerInfraService() {
@@ -53,14 +53,18 @@ public class InfinispanLocalContainerInfraService implements InfinispanInfraServ
     public InfinispanLocalContainerInfraService(String containerImage) {
         isNetworkHost = isHostNetworkMode();
         container = initContainer(containerImage, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public InfinispanLocalContainerInfraService(GenericContainer container) {
+    public InfinispanLocalContainerInfraService(GenericContainer<?> container) {
         isNetworkHost = isHostNetworkMode();
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
         final Logger containerLog = LoggerFactory.getLogger("container." + containerName);
         final Consumer<OutputFrame> logConsumer = new Slf4jLogConsumer(containerLog);
 
@@ -122,7 +126,7 @@ public class InfinispanLocalContainerInfraService implements InfinispanInfraServ
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
index 3a36e8144cd..b4646c70b2f 100644
--- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
+++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
@@ -40,10 +40,18 @@ public class ContainerLocalKafkaInfraService implements KafkaInfraService, Conta
 
     public ContainerLocalKafkaInfraService() {
         kafka = initContainer();
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            kafka.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public ContainerLocalKafkaInfraService(KafkaContainer kafka) {
         this.kafka = kafka;
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            kafka.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     protected KafkaContainer initContainer() {
diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
index 1ca326f61ef..674f5b4d105 100644
--- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
+++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.kafka.services;
 
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.common.TestUtils;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.test.infra.kafka.common.KafkaProperties;
 import org.slf4j.Logger;
@@ -41,6 +42,10 @@ public class RedpandaInfraService implements KafkaInfraService, ContainerService
         Network network = Network.newNetwork();
 
         redpandaContainer = initRedpandaContainer(network, redpandaInstanceName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            redpandaContainer.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public RedpandaInfraService(RedpandaContainer redpandaContainer) {
diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
index 11264409726..a0f7036ac20 100644
--- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
+++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
@@ -54,7 +54,6 @@ public class StrimziContainer extends GenericContainer<StrimziContainer> {
 
     private void setupContainer(String name, CreateContainerCmd createContainerCmd) {
         createContainerCmd.withHostName(name);
-        createContainerCmd.withName(name);
     }
 
     public int getKafkaPort() {
diff --git a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
index 9f22324a928..2209dd2ac99 100644
--- a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
+++ b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.infra.kafka.services;
 
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.common.TestUtils;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.test.infra.kafka.common.KafkaProperties;
 import org.slf4j.Logger;
@@ -44,6 +45,10 @@ public class StrimziInfraService implements KafkaInfraService, ContainerService<
 
         zookeeperContainer = initZookeeperContainer(network, zookeeperInstanceName);
         strimziContainer = initStrimziContainer(network, strimziInstanceName, zookeeperInstanceName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            strimziContainer.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public StrimziInfraService(ZookeeperContainer zookeeperContainer, StrimziContainer strimziContainer) {
diff --git a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
index 03d3d6aa4e8..fc557bb64e2 100644
--- a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
+++ b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
@@ -17,3 +17,4 @@
 kafka3.container=mirror.gcr.io/apache/kafka:3.9.1
 redpanda.container.image=mirror.gcr.io/redpandadata/redpanda:v24.1.16
 strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.9.1
+confluent.container.image=mirror.gcr.io/confluentinc/cp-kafka:7.9.2
\ No newline at end of file
diff --git a/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
index fe48741bf03..527cb7fcdcc 100644
--- a/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
@@ -33,12 +33,12 @@ import org.testcontainers.utility.DockerImageName;
               serviceAlias = { "microprofile" },
               serviceImplementationAlias = "lra")
 public class MicroprofileLRALocalContainerInfraService
-        implements MicroprofileLRAInfraService, ContainerService<GenericContainer> {
+        implements MicroprofileLRAInfraService, ContainerService<GenericContainer<?>> {
     public static final String CONTAINER_NAME = "microprofile-lra";
 
     private static final Logger LOG = LoggerFactory.getLogger(MicroprofileLRALocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public MicroprofileLRALocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(
@@ -48,13 +48,17 @@ public class MicroprofileLRALocalContainerInfraService
 
     public MicroprofileLRALocalContainerInfraService(String imageName) {
         container = initContainer(imageName, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public MicroprofileLRALocalContainerInfraService(GenericContainer container) {
+    public MicroprofileLRALocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    public GenericContainer initContainer(String imageName, String networkAlias) {
+    public GenericContainer<?> initContainer(String imageName, String networkAlias) {
         class MicroprofileLRAContainer extends GenericContainer<MicroprofileLRAContainer> {
             public MicroprofileLRAContainer(boolean fixedPort) {
                 super(DockerImageName.parse(imageName));
@@ -97,7 +101,7 @@ public class MicroprofileLRALocalContainerInfraService
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
index 7605434debc..63a18b5046d 100644
--- a/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
@@ -46,6 +46,10 @@ public class MilvusLocalContainerInfraService implements MilvusInfraService, Con
 
     public MilvusLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public MilvusLocalContainerInfraService(MilvusContainer container) {
diff --git a/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
index 8e2b4e0f1d8..ba1560b03bd 100644
--- a/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
@@ -31,7 +31,7 @@ import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 @InfraService(service = MinioInfraService.class,
               description = "MinIO Object Storage, S3 compatible",
               serviceAlias = { "minio" })
-public class MinioLocalContainerInfraService implements MinioInfraService, ContainerService<GenericContainer> {
+public class MinioLocalContainerInfraService implements MinioInfraService, ContainerService<GenericContainer<?>> {
     public static final String CONTAINER_NAME = "minio";
     private static final String ACCESS_KEY;
     private static final String SECRET_KEY;
@@ -44,7 +44,7 @@ public class MinioLocalContainerInfraService implements MinioInfraService, Conta
         SECRET_KEY = System.getProperty(MinioProperties.SECRET_KEY, "testSecretKey");
     }
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public MinioLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(MinioLocalContainerInfraService.class, MinioProperties.MINIO_CONTAINER));
@@ -52,13 +52,17 @@ public class MinioLocalContainerInfraService implements MinioInfraService, Conta
 
     public MinioLocalContainerInfraService(String containerName) {
         container = initContainer(containerName, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public MinioLocalContainerInfraService(GenericContainer container) {
+    public MinioLocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
 
         class MinioContainer extends GenericContainer<MinioContainer> {
             public MinioContainer(boolean fixedPort) {
@@ -108,7 +112,7 @@ public class MinioLocalContainerInfraService implements MinioInfraService, Conta
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
index 4d656dbaa45..44d3d899d4f 100644
--- a/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
@@ -41,6 +41,10 @@ public class MongoDBLocalContainerInfraService implements MongoDBInfraService, C
 
     public MongoDBLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public MongoDBLocalContainerInfraService(MongoDBContainer container) {
@@ -50,10 +54,6 @@ public class MongoDBLocalContainerInfraService implements MongoDBInfraService, C
     protected MongoDBContainer initContainer(String imageName) {
 
         class TestInfraMongoDBContainer extends MongoDBContainer {
-            public TestInfraMongoDBContainer(boolean fixedPort) {
-                super();
-                addPort(fixedPort);
-            }
 
             public TestInfraMongoDBContainer(boolean fixedPort, String imageName) {
                 super(DockerImageName.parse(imageName).asCompatibleSubstituteFor("mongo"));
@@ -68,12 +68,7 @@ public class MongoDBLocalContainerInfraService implements MongoDBInfraService, C
                 }
             }
         }
-
-        if (imageName == null || imageName.isEmpty()) {
-            return new TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
-        } else {
-            return new TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()), imageName);
-        }
+        return new TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()), imageName);
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
index 1659dd1532b..d3cb89fe329 100644
--- a/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
@@ -31,13 +31,13 @@ import org.testcontainers.containers.wait.strategy.Wait;
 @InfraService(service = MosquittoInfraService.class,
               description = "Mosquitto is a message broker that implements MQTT protocol",
               serviceAlias = { "mosquitto" })
-public class MosquittoLocalContainerInfraService implements MosquittoInfraService, ContainerService<GenericContainer> {
+public class MosquittoLocalContainerInfraService implements MosquittoInfraService, ContainerService<GenericContainer<?>> {
     public static final String CONTAINER_NAME = "mosquitto";
     public static final int CONTAINER_PORT = 1883;
 
     private static final Logger LOG = LoggerFactory.getLogger(MosquittoLocalContainerInfraService.class);
 
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public MosquittoLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(MosquittoLocalContainerInfraService.class,
@@ -60,19 +60,19 @@ public class MosquittoLocalContainerInfraService implements MosquittoInfraServic
         }
     }
 
-    public MosquittoLocalContainerInfraService(GenericContainer container) {
+    public MosquittoLocalContainerInfraService(GenericContainer<?> container) {
         this.container = container;
     }
 
-    protected GenericContainer initContainer(String imageName, Integer port) {
-        GenericContainer ret;
+    protected GenericContainer<?> initContainer(String imageName, Integer port) {
+        GenericContainer<?> ret;
 
         if (port == null) {
             ret = new GenericContainer(imageName)
                     .withExposedPorts(CONTAINER_PORT);
         } else {
             @SuppressWarnings("deprecation")
-            GenericContainer fixedPortContainer = new FixedHostPortGenericContainer(imageName)
+            GenericContainer<?> fixedPortContainer = new FixedHostPortGenericContainer(imageName)
                     .withFixedExposedPort(port, CONTAINER_PORT);
             ret = fixedPortContainer;
         }
@@ -81,7 +81,10 @@ public class MosquittoLocalContainerInfraService implements MosquittoInfraServic
                 .withClasspathResourceMapping("mosquitto.conf", "/mosquitto/config/mosquitto.conf", BindMode.READ_ONLY)
                 .waitingFor(Wait.forLogMessage(".* mosquitto version .* running", 1))
                 .waitingFor(Wait.forListeningPort());
-
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            ret.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
         return ret;
     }
 
@@ -106,7 +109,7 @@ public class MosquittoLocalContainerInfraService implements MosquittoInfraServic
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
index 1c0a4799057..4217de05036 100644
--- a/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
@@ -29,12 +29,12 @@ import org.testcontainers.containers.wait.strategy.Wait;
 @InfraService(service = NatsInfraService.class,
               description = "Messaging Platform NATS",
               serviceAlias = { "nats" })
-public class NatsLocalContainerInfraService implements NatsInfraService, ContainerService<GenericContainer> {
+public class NatsLocalContainerInfraService implements NatsInfraService, ContainerService<GenericContainer<?>> {
     public static final String CONTAINER_NAME = "nats";
     private static final int PORT = 4222;
 
     private static final Logger LOG = LoggerFactory.getLogger(NatsLocalContainerInfraService.class);
-    private final GenericContainer container;
+    private final GenericContainer<?> container;
 
     public NatsLocalContainerInfraService() {
         this(LocalPropertyResolver.getProperty(NatsLocalContainerInfraService.class, NatsProperties.NATS_CONTAINER));
@@ -42,9 +42,13 @@ public class NatsLocalContainerInfraService implements NatsInfraService, Contain
 
     public NatsLocalContainerInfraService(String imageName) {
         container = initContainer(imageName, CONTAINER_NAME);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    protected GenericContainer initContainer(String imageName, String containerName) {
+    protected GenericContainer<?> initContainer(String imageName, String containerName) {
         class NatsContainer extends GenericContainer<NatsContainer> {
             public NatsContainer(boolean fixedPort) {
                 super(imageName);
@@ -84,7 +88,7 @@ public class NatsLocalContainerInfraService implements NatsInfraService, Contain
     }
 
     @Override
-    public GenericContainer getContainer() {
+    public GenericContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
index fc2ed90fb89..4d2d93cb23c 100644
--- a/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
@@ -50,7 +50,6 @@ public class OllamaLocalContainerInfraService implements OllamaInfraService, Con
 
     public OllamaLocalContainerInfraService() {
         container = initContainer();
-
         configuration = new DefaultServiceConfiguration();
     }
 
@@ -68,6 +67,10 @@ public class OllamaLocalContainerInfraService implements OllamaInfraService, Con
                 if (fixedPort) {
                     addFixedExposedPort(11434, 11434);
                 }
+                String name = ContainerEnvironmentUtil.containerName(OllamaLocalContainerInfraService.this.getClass());
+                if (name != null) {
+                    withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+                }
             }
         }
 
diff --git a/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
index 67fe021b743..5e863abdd90 100644
--- a/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
@@ -36,6 +36,10 @@ public class OpenldapLocalContainerInfraService implements OpenldapInfraService,
 
     public OpenldapLocalContainerInfraService() {
         container = new OpenLdapContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
index 1fb3d2f4556..54619cd71f8 100644
--- a/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
@@ -29,12 +29,12 @@ import org.testcontainers.utility.DockerImageName;
 @InfraService(service = PostgresInfraService.class,
               description = "Postgres SQL Database",
               serviceAlias = { "postgres" })
-public class PostgresLocalContainerInfraService implements PostgresInfraService, ContainerService<PostgreSQLContainer> {
+public class PostgresLocalContainerInfraService implements PostgresInfraService, ContainerService<PostgreSQLContainer<?>> {
     public static final String DEFAULT_POSTGRES_CONTAINER
             = LocalPropertyResolver.getProperty(PostgresLocalContainerInfraService.class,
                     PostgresProperties.POSTGRES_CONTAINER);
     private static final Logger LOG = LoggerFactory.getLogger(PostgresLocalContainerInfraService.class);
-    private final PostgreSQLContainer container;
+    private final PostgreSQLContainer<?> container;
 
     public PostgresLocalContainerInfraService() {
         this(DEFAULT_POSTGRES_CONTAINER);
@@ -42,13 +42,17 @@ public class PostgresLocalContainerInfraService implements PostgresInfraService,
 
     public PostgresLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
-    public PostgresLocalContainerInfraService(PostgreSQLContainer container) {
+    public PostgresLocalContainerInfraService(PostgreSQLContainer<?> container) {
         this.container = container;
     }
 
-    protected PostgreSQLContainer initContainer(String imageName) {
+    protected PostgreSQLContainer<?> initContainer(String imageName) {
         class TestInfraPostgreSQLContainer extends PostgreSQLContainer {
             public TestInfraPostgreSQLContainer(boolean fixedPort) {
                 super(DockerImageName.parse(imageName)
@@ -88,7 +92,7 @@ public class PostgresLocalContainerInfraService implements PostgresInfraService,
     }
 
     @Override
-    public PostgreSQLContainer getContainer() {
+    public PostgreSQLContainer<?> getContainer() {
         return container;
     }
 
diff --git a/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
index c209526e638..4471ab5ee3c 100644
--- a/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
@@ -43,6 +43,10 @@ public class PulsarLocalContainerInfraService implements PulsarInfraService, Con
 
     public PulsarLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public PulsarLocalContainerInfraService(PulsarContainer container) {
diff --git a/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
index e11caf42cbd..c9715c5d754 100644
--- a/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
@@ -44,6 +44,10 @@ public class QdrantLocalContainerInfraService implements QdrantInfraService, Con
 
     public QdrantLocalContainerInfraService(String imageName) {
         this.container = initContainer(imageName, ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public QdrantLocalContainerInfraService(QdrantContainer container) {
diff --git a/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
index bb0fedeebb2..a9e8e197f31 100644
--- a/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
@@ -42,6 +42,10 @@ public class RabbitMQLocalContainerInfraService implements RabbitMQInfraService,
 
     public RabbitMQLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public RabbitMQLocalContainerInfraService(RabbitMQContainer container) {
diff --git a/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
index cb4bf601024..6b10b74d4df 100644
--- a/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
@@ -33,11 +33,19 @@ public class RedisLocalContainerInfraService implements RedisInfraService, Conta
 
     public RedisLocalContainerInfraService() {
         container = new RedisContainer();
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public RedisLocalContainerInfraService(String imageName) {
         container = RedisContainer.initContainer(imageName, RedisContainer.CONTAINER_NAME,
                 ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
index 6cbbe0ee2a6..6ede4e105a6 100644
--- a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
+++ b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
@@ -50,6 +50,5 @@ public class RocketMQBrokerContainer extends GenericContainer<RocketMQBrokerCont
                 "-c", "/opt/rocketmq-" + RocketMQContainerInfraService.ROCKETMQ_VERSION + "/conf/broker.conf");
 
         waitingFor(Wait.forListeningPort());
-        withCreateContainerCmdModifier(cmd -> cmd.withName(confName));
     }
 }
diff --git a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
index 8b6c5898506..5743ea982b6 100644
--- a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
+++ b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
@@ -52,6 +52,10 @@ public class RocketMQContainerInfraService implements RocketMQInfraService, Cont
 
         brokerContainer1
                 = new RocketMQBrokerContainer(network, "broker1", ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            brokerContainer1.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
index c27aed19408..d02a61f8981 100644
--- a/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.smb.services;
 
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
+import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.util.IOHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,11 +26,16 @@ import org.slf4j.LoggerFactory;
 @InfraService(service = SmbLocalContainerInfraService.class,
               description = "SAMBA File Server",
               serviceAlias = "smb")
-public class SmbLocalContainerInfraService implements SmbInfraService {
+public class SmbLocalContainerInfraService implements SmbInfraService, ContainerService<SmbContainer> {
+
     protected static final Logger LOG = LoggerFactory.getLogger(SmbLocalContainerInfraService.class);
     protected final SmbContainer container = new SmbContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
 
     public SmbLocalContainerInfraService() {
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
@@ -56,6 +62,11 @@ public class SmbLocalContainerInfraService implements SmbInfraService {
         return this.container.copyFileFromContainer("data/rw/" + file, IOHelper::loadText);
     }
 
+    @Override
+    public SmbContainer getContainer() {
+        return container;
+    }
+
     @Override
     public void registerProperties() {
     }
@@ -64,11 +75,12 @@ public class SmbLocalContainerInfraService implements SmbInfraService {
     public void initialize() {
         container.start();
         registerProperties();
-
         LOG.info("SMB host running at address {}:", address());
     }
 
     @Override
     public void shutdown() {
+        LOG.info("Stopping the Smb container");
+        container.stop();
     }
 }
diff --git a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java
index f85dd453fd8..656da631a03 100644
--- a/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java
+++ b/test-infra/camel-test-infra-smb/src/test/java/org/apache/camel/test/infra/smb/services/SmbServiceFactory.java
@@ -21,14 +21,50 @@ import java.io.InputStream;
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 import org.testcontainers.utility.ThrowingFunction;
 
 public class SmbServiceFactory {
 
-    public static SmbService createService() {
-        SimpleTestServiceBuilder<SmbService> builder = new SimpleTestServiceBuilder<>("smb");
+    static class SingletonSmbService extends SingletonService<SmbService> implements SmbService {
+        public SingletonSmbService(SmbService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public String address() {
+            return getService().address();
+        }
+
+        @Override
+        public String password() {
+            return getService().password();
+        }
+
+        @Override
+        public String shareName() {
+            return getService().shareName();
+        }
+
+        @Override
+        public String smbFile(String file) {
+            return getService().smbFile(file);
+        }
+
+        @Override
+        public String userName() {
+            return getService().userName();
+        }
+
+        @Override
+        public <T> T copyFileFromContainer(String fileName, ThrowingFunction<InputStream, T> function) {
+            return getService().copyFileFromContainer(fileName, function);
+        }
+    }
 
-        return builder.addLocalMapping(SmbLocalContainerService::new)
+    public static SmbService createService() {
+        return builder()
+                .addLocalMapping(SmbLocalContainerService::new)
                 .addRemoteMapping(SmbRemoteService::new)
                 .build();
     }
@@ -40,6 +76,24 @@ public class SmbServiceFactory {
         }
     }
 
+    public static SimpleTestServiceBuilder<SmbService> builder() {
+        return new SimpleTestServiceBuilder<>("smb");
+    }
+
+    public static SmbService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final SmbService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<SmbService> instance = builder();
+            instance.addLocalMapping(() -> new SingletonSmbService(new SmbLocalContainerService(), "smb"))
+                    .addRemoteMapping(SmbRemoteService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     public static class SmbLocalContainerService extends SmbLocalContainerInfraService implements SmbService {
 
         @Override
@@ -51,26 +105,5 @@ public class SmbServiceFactory {
                 return null;
             }
         }
-
-        @Override
-        public void registerProperties() {
-        }
-
-        @Override
-        public void initialize() {
-            container.start();
-            registerProperties();
-
-            LOG.info("SMB host running at address {}:", address());
-        }
-
-        @Override
-        public void shutdown() {
-        }
-
-        @Override
-        public void close() {
-
-        }
     }
 }
diff --git a/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
index aaa642fd682..8fbe8fdc87a 100644
--- a/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
@@ -34,6 +34,10 @@ public class SolrLocalContainerInfraService implements SolrInfraService, Contain
     public SolrLocalContainerInfraService() {
         container = SolrContainer.initContainer(SolrContainer.CONTAINER_NAME,
                 ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @Override
diff --git a/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
index 3ea667651c7..9996916d00f 100644
--- a/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
@@ -49,6 +49,10 @@ public class TorchServeLocalContainerInfraService implements TorchServeInfraServ
                 TorchServeProperties.TORCHSERVE_CONTAINER);
 
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     @SuppressWarnings("resource")
diff --git a/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
index 01785fe9273..42d821d3a80 100644
--- a/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
@@ -38,6 +38,10 @@ public class XmppLocalContainerInfraService implements XmppInfraService, Contain
 
     public XmppLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public XmppLocalContainerInfraService(XmppServerContainer container) {
diff --git a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
index 7b89060a265..a8bd662849f 100644
--- a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
+++ b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.zookeeper.services;
 
 import org.apache.camel.spi.annotations.InfraService;
 import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.apache.camel.test.infra.common.services.ContainerService;
 import org.apache.camel.test.infra.zookeeper.common.ZooKeeperProperties;
 import org.slf4j.Logger;
@@ -38,6 +39,10 @@ public class ZooKeeperLocalContainerInfraService implements ZooKeeperInfraServic
 
     public ZooKeeperLocalContainerInfraService(String imageName) {
         container = initContainer(imageName);
+        String name = ContainerEnvironmentUtil.containerName(this.getClass());
+        if (name != null) {
+            container.withCreateContainerCmdModifier(cmd -> cmd.withName(name));
+        }
     }
 
     public ZooKeeperLocalContainerInfraService(ZooKeeperContainer container) {