diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
index 6dec2131bde..4bec350d6ef 100644
--- a/modules/clickhouse/build.gradle
+++ b/modules/clickhouse/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.0', classifier: 'http')
+    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')
diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
index 80fb71bd5da..250631c1500 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
@@ -1,16 +1,24 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class ClickHouseProvider extends JdbcDatabaseContainerProvider {
 
+    private static final String DEFAULT_TAG = "24.12-alpine";
+
     @Override
     public boolean supports(String databaseType) {
-        return databaseType.equals(ClickHouseContainer.NAME);
+        return databaseType.equals("clickhouse");
+    }
+
+    @Override
+    public JdbcDatabaseContainer<?> newInstance() {
+        return newInstance(DEFAULT_TAG);
     }
 
     @Override
-    public JdbcDatabaseContainer newInstance(String tag) {
-        return new ClickHouseContainer(DockerImageName.parse(ClickHouseContainer.IMAGE).withTag(tag));
+    public JdbcDatabaseContainer<?> newInstance(String tag) {
+        return new ClickHouseContainer(DockerImageName.parse("clickhouse/clickhouse-server").withTag(tag));
     }
 }