diff --git a/pom.xml b/pom.xml
index 0f318c11..644d3e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers</artifactId>
+				<artifactId>consul</artifactId>
 				<version>${testcontainers.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml
index 8c3f6c26..b9a1b507 100644
--- a/spring-cloud-consul-binder/pom.xml
+++ b/spring-cloud-consul-binder/pom.xml
@@ -75,7 +75,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml
index 4a99a08e..70a2513f 100644
--- a/spring-cloud-consul-config/pom.xml
+++ b/spring-cloud-consul-config/pom.xml
@@ -84,7 +84,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml
index 98176a68..813ad124 100644
--- a/spring-cloud-consul-core/pom.xml
+++ b/spring-cloud-consul-core/pom.xml
@@ -100,7 +100,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java
index 027bb487..4ed6a0b6 100644
--- a/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java
+++ b/spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/test/ConsulTestcontainers.java
@@ -21,9 +21,8 @@ import java.util.HashMap;
 import com.ecwid.consul.v1.ConsulClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.consul.ConsulContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.wait.strategy.Wait;
 
 import org.springframework.cloud.consul.ConsulProperties;
 import org.springframework.context.ApplicationContextInitializer;
@@ -43,18 +42,16 @@ public class ConsulTestcontainers implements ApplicationContextInitializer<Confi
 	/**
 	 * Shared consul container.
 	 */
-	public static GenericContainer<?> consul = createConsulContainer();
+	public static ConsulContainer consul = createConsulContainer();
 
-	public static GenericContainer<?> createConsulContainer() {
+	public static ConsulContainer createConsulContainer() {
 		return createConsulContainer("1.7");
 	}
 
-	public static GenericContainer<?> createConsulContainer(String consulVersion) {
+	public static ConsulContainer createConsulContainer(String consulVersion) {
 		String dockerImageName = "consul:" + consulVersion;
-		return new GenericContainer<>(dockerImageName)
-				.withLogConsumer(new Slf4jLogConsumer(logger).withSeparateOutputStreams())
-				.waitingFor(Wait.forHttp("/v1/status/leader")).withExposedPorts(DEFAULT_PORT)
-				.withCommand("agent", "-dev", "-server", "-bootstrap", "-client", "0.0.0.0", "-log-level", "trace");
+		return new ConsulContainer(dockerImageName)
+				.withLogConsumer(new Slf4jLogConsumer(logger).withSeparateOutputStreams());
 	}
 
 	@Override
diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml
index 7f7d4f87..e54260f2 100644
--- a/spring-cloud-consul-discovery/pom.xml
+++ b/spring-cloud-consul-discovery/pom.xml
@@ -131,7 +131,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java
index 27be1589..9f2f28f1 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientNoPortTests.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.ecwid.consul.v1.ConsulClient;
 import com.ecwid.consul.v1.agent.model.NewService;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.consul.ConsulContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -54,11 +54,11 @@ public class ConsulDiscoveryClientNoPortTests {
 
 	// 1.10 introduces different data for port
 	@Container
-	static GenericContainer<?> consul = ConsulTestcontainers.createConsulContainer("1.10");
+	static ConsulContainer consul = ConsulTestcontainers.createConsulContainer("1.10");
 
 	@DynamicPropertySource
 	static void consulProperties(DynamicPropertyRegistry registry) {
-		registry.add(ConsulProperties.PREFIX + ".host", consul::getContainerIpAddress);
+		registry.add(ConsulProperties.PREFIX + ".host", consul::getHost);
 		registry.add(ConsulProperties.PREFIX + ".port", () -> consul.getMappedPort(ConsulTestcontainers.DEFAULT_PORT));
 	}
 
diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml
index 7a360782..efcd2134 100644
--- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml
+++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml
@@ -69,7 +69,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml
index a4f2c328..32c7218e 100644
--- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml
+++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml
@@ -54,7 +54,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>consul</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>