diff --git a/hack/helm_vars/common.yaml.gotmpl b/hack/helm_vars/common.yaml.gotmpl
index 4b296fb8fc..083e689e10 100644
--- a/hack/helm_vars/common.yaml.gotmpl
+++ b/hack/helm_vars/common.yaml.gotmpl
@@ -13,6 +13,12 @@ dynBackendDomain1: dynamic-backend-1.{{ requiredEnv "NAMESPACE_1" }}.svc.cluster
 dynBackendDomain2: dynamic-backend-2.{{ requiredEnv "NAMESPACE_1" }}.svc.cluster.local
 dynBackendDomain3: dynamic-backend-3.{{ requiredEnv "NAMESPACE_1" }}.svc.cluster.local
 
+{{- if (eq (env "CONVERSATION_STORE") "") }}
+conversationStore: cassandra
+{{- else }}
+conversationStore: {{ env "CONVERSATION_STORE" }}
+{{- end }}
+
 {{- if (eq (env "UPLOAD_XML_S3_BASE_URL") "") }}
 uploadXml: {}
 {{- else }}
diff --git a/hack/helmfile.yaml.gotmpl b/hack/helmfile.yaml.gotmpl
index c932b2f000..2fe0dc9791 100644
--- a/hack/helmfile.yaml.gotmpl
+++ b/hack/helmfile.yaml.gotmpl
@@ -352,6 +352,8 @@ releases:
         value: {{ .Values.federationDomain1 }}
       - name: brig.config.wireServerEnterprise.enabled
         value: true
+      - name: galley.config.postgresMigration.conversation
+        value: {{ .Values.conversationStore }}
     needs:
       - 'cassandra-ephemeral'
       - 'redis-ephemeral'
@@ -370,6 +372,8 @@ releases:
         value: {{ .Values.federationDomain2 }}
       - name: cargohold.config.settings.federationDomain
         value: {{ .Values.federationDomain2 }}
+      - name: galley.config.postgresMigration.conversation
+        value: {{ .Values.conversationStore }}
     needs:
       - 'cassandra-ephemeral'
       - 'redis-ephemeral'