diff --git a/infra/charts/feast-feature-server/README.md b/infra/charts/feast-feature-server/README.md
index c334acf24e6..9844edb5d19 100644
--- a/infra/charts/feast-feature-server/README.md
+++ b/infra/charts/feast-feature-server/README.md
@@ -35,6 +35,7 @@ See [here](https://github.com/feast-dev/feast/tree/master/examples/python-helm-d
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
+| commandArgs | list | `[]` | Override the default command arguments for complete control over CLI options |
 | extraEnvs | list | `[]` | Additional environment variables to be set in the container |
 | feast_mode | string | `"online"` | Feast supported deployment modes - online (default), offline, ui and registry |
 | feature_store_yaml_base64 | string | `""` | [required] a base64 encoded version of feature_store.yaml |
diff --git a/infra/charts/feast-feature-server/templates/deployment.yaml b/infra/charts/feast-feature-server/templates/deployment.yaml
index 8af21aae80b..6cd17d4a4d1 100644
--- a/infra/charts/feast-feature-server/templates/deployment.yaml
+++ b/infra/charts/feast-feature-server/templates/deployment.yaml
@@ -47,6 +47,10 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end}}
           command:
+            {{- if .Values.commandArgs }}
+            {{- toYaml .Values.commandArgs | nindent 12 }}
+            {{- else }}
+            {{- /* Fallback to legacy behavior for backward compatibility */}}
             {{- if eq .Values.feast_mode "offline" }}
             - "feast"
             - "--log-level"
@@ -82,6 +86,7 @@ spec:
             - "0.0.0.0"
             {{- end }}
             {{- end }}
+            {{- end }}
           ports:
             - name: {{ .Values.feast_mode }}
               {{- if eq .Values.feast_mode "offline" }}
diff --git a/infra/charts/feast-feature-server/values.yaml b/infra/charts/feast-feature-server/values.yaml
index 719e8f9cb7a..619817985d7 100644
--- a/infra/charts/feast-feature-server/values.yaml
+++ b/infra/charts/feast-feature-server/values.yaml
@@ -29,6 +29,24 @@ feature_store_yaml_base64: ""
 # feast_mode -- Feast supported deployment modes - online (default), offline, ui and registry
 feast_mode: "online"
 
+# commandArgs -- Override the default command arguments for complete control over CLI options
+# If not specified, falls back to legacy behavior based on feast_mode
+# Example for UI mode with custom options:
+# commandArgs:
+#   - "feast"
+#   - "--log-level"
+#   - "INFO"
+#   - "ui"
+#   - "--root_path"
+#   - "/feast"
+#   - "--registry_ttl_sec"
+#   - "300"
+#   - "-h"
+#   - "0.0.0.0"
+#   - "-p"
+#   - "8888"
+commandArgs: []
+
 podAnnotations: {}
 
 podSecurityContext: {}