diff --git a/bitnami/clickhouse/templates/scripts-configmap.yaml b/bitnami/clickhouse/templates/scripts-configmap.yaml
index 1a4288de4064e9..e3f6dd189c690a 100644
--- a/bitnami/clickhouse/templates/scripts-configmap.yaml
+++ b/bitnami/clickhouse/templates/scripts-configmap.yaml
@@ -31,4 +31,4 @@ data:
             exit 1
         fi
     fi
-    exec /opt/bitnami/scripts/clickhouse/entrypoint.sh /opt/bitnami/scripts/clickhouse/run.sh -- --listen_host=0.0.0.0
+    exec /opt/bitnami/scripts/clickhouse/entrypoint.sh /opt/bitnami/scripts/clickhouse/run.sh  "$@"
diff --git a/bitnami/clickhouse/values.yaml b/bitnami/clickhouse/values.yaml
index f2ee6d998d5a77..d7568ed66b3e09 100644
--- a/bitnami/clickhouse/values.yaml
+++ b/bitnami/clickhouse/values.yaml
@@ -415,6 +415,8 @@ defaultConfigurationOverrides: |
         <asynchronous_metrics>true</asynchronous_metrics>
     </prometheus>
     {{- end }}
+    <listen_host>0.0.0.0</listen_host>
+    <listen_host>::</listen_host>
   </clickhouse>
 ## @param existingOverridesConfigmap The name of an existing ConfigMap with your custom configuration for ClickHouse
 ##