diff --git a/charts/langsmith/Chart.yaml b/charts/langsmith/Chart.yaml
index a2807ba..e1ce8ee 100644
--- a/charts/langsmith/Chart.yaml
+++ b/charts/langsmith/Chart.yaml
@@ -5,5 +5,5 @@ maintainers:
     email: ankush@langchain.dev
 description: Helm chart to deploy the langsmith application and all services it depends on.
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "0.1.0"
diff --git a/charts/langsmith/templates/clickhouse/config-map.yaml b/charts/langsmith/templates/clickhouse/config-map.yaml
index 4d0bb2b..cfd8acc 100644
--- a/charts/langsmith/templates/clickhouse/config-map.yaml
+++ b/charts/langsmith/templates/clickhouse/config-map.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.clickhouse.external.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -18,3 +19,4 @@ data:
             </default>
         </users>
     </clickhouse>
+{{- end }}
diff --git a/charts/langsmith/templates/clickhouse/service-account.yaml b/charts/langsmith/templates/clickhouse/service-account.yaml
index d5d278e..2ae60e3 100644
--- a/charts/langsmith/templates/clickhouse/service-account.yaml
+++ b/charts/langsmith/templates/clickhouse/service-account.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.clickhouse.serviceAccount.create -}}
+{{- if and (not .Values.clickhouse.external.enabled) .Values.clickhouse.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/langsmith/templates/postgres/service-account.yaml b/charts/langsmith/templates/postgres/service-account.yaml
index d6c3a4e..8f3b150 100644
--- a/charts/langsmith/templates/postgres/service-account.yaml
+++ b/charts/langsmith/templates/postgres/service-account.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.postgres.serviceAccount.create -}}
+{{- if and (not .Values.postgres.external.enabled) .Values.postgres.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/langsmith/templates/redis/service-account.yaml b/charts/langsmith/templates/redis/service-account.yaml
index fc57484..f64b9c2 100644
--- a/charts/langsmith/templates/redis/service-account.yaml
+++ b/charts/langsmith/templates/redis/service-account.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.redis.serviceAccount.create -}}
+{{- if and (not .Values.redis.external.enabled) .Values.redis.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: