diff --git a/charts/azimuth-chat/azimuth-ui.schema.yaml b/charts/azimuth-chat/azimuth-ui.schema.yaml
index 061a8ce..1c0da6a 100644
--- a/charts/azimuth-chat/azimuth-ui.schema.yaml
+++ b/charts/azimuth-chat/azimuth-ui.schema.yaml
@@ -6,7 +6,7 @@ controls:
     type: TextControl
     secret: true
   # Use mirror to mimic yaml anchor in base Helm chart
-  /azimuth-llm/ui/appSettings/hf_model_name:
+  /azimuth-llm/ui/appSettings/model_name:
     type: MirrorControl
     path: /azimuth-llm/huggingface/model
     visuallyHidden: true
@@ -16,13 +16,12 @@ controls:
   /azimuth-llm/api/modelMaxContextLength:
     type: IntegerControl
     minimum: 100
-    step: 100
     required: false
 
 sortOrder:
   - /azimuth-llm/huggingface/model
   - /azimuth-llm/huggingface/token
-  - /azimuth-llm/ui/appSettings/hf_model_instruction
+  - /azimuth-llm/ui/appSettings/model_instruction
   - /azimuth-llm/ui/appSettings/page_title
   - /azimuth-llm/api/image/version
   - /azimuth-llm/ui/appSettings/llm_temperature
diff --git a/charts/azimuth-image-analysis/azimuth-ui.schema.yaml b/charts/azimuth-image-analysis/azimuth-ui.schema.yaml
index 5c4799c..d244a5a 100644
--- a/charts/azimuth-image-analysis/azimuth-ui.schema.yaml
+++ b/charts/azimuth-image-analysis/azimuth-ui.schema.yaml
@@ -6,7 +6,7 @@ controls:
     type: TextControl
     secret: true
   # Use mirror to mimic yaml anchor in base Helm chart
-  /azimuth-llm/ui/appSettings/hf_model_name:
+  /azimuth-llm/ui/appSettings/model_name:
     type: MirrorControl
     path: /azimuth-llm/huggingface/model
     visuallyHidden: true
@@ -14,8 +14,6 @@ controls:
 sortOrder:
   - /huggingface/model
   - /huggingface/token
-  - /ui/appSettings/hf_model_instruction
-  - /ui/appSettings/page_title
   - /api/image/version
   - /ui/appSettings/llm_temperature
   - /ui/appSettings/llm_max_tokens
@@ -23,4 +21,3 @@ sortOrder:
   - /ui/appSettings/llm_presence_penalty
   - /ui/appSettings/llm_top_p
   - /ui/appSettings/llm_top_k
-  - /api/modelMaxContextLength