diff --git a/templates/config.yaml b/templates/config.yaml
index 12e7355..eeabd42 100644
--- a/templates/config.yaml
+++ b/templates/config.yaml
@@ -40,9 +40,13 @@ data:
         {{- end}}
         shutdown_timeout          =   {{ .Values.shutdownTimeout | default "60_000" }}
         prepared_statements       =   {{ .Values.preparedStatements | default "extended" | quote }}
+        {{- with .Values.queryParser }}
+        query_parser              =   {{ . | quote }}
+        {{- else }}
         {{- with .Values.queryParserEnabled }}
         query_parser_enabled      =   {{ . }}
         {{- end }}
+        {{- end }}
         {{- if .Values.preparedStatementsLimit }}
         prepared_statements_limit =   {{ .Values.preparedStatementsLimit }}
         {{- end}}
diff --git a/values.yaml b/values.yaml
index 94cbc63..168b15a 100644
--- a/values.yaml
+++ b/values.yaml
@@ -329,3 +329,11 @@ queryStats:
 # tcpTime: 7200
 # tcpInterval: 75
 # tcpRetries: 9
+
+# Query parser configuration
+# queryParser controls whether the query parser is enabled
+# Valid values: "auto", "on", "off"
+# queryParser: "auto"
+
+# queryParserEnabled is DEPRECATED - use queryParser instead
+# queryParserEnabled: true