diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index b577ba0dc..752a5bef5 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -7,10 +7,10 @@
                     <tree editable="bottom">
                         <field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
                         <field name="name" string="" readonly="0"/>
-                        <field name="done_by" string=""/>
-                         <field name="comment" string=""/>
-                        <field name="lase_click_date" string=""/>
+                        <field name="comment" string=""/>
                         <field name="approval_state" string=""/>
+                        <field name="done_by" string=""/>
+                        <field name="lase_click_date" string=""/>
                         <field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
                         <field name="document_ids" string="" widget="preview_many2many"/>
                     </tree>
@@ -21,10 +21,10 @@
                     <tree editable="bottom">
                         <field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
                         <field name="name" string="" readonly="0"/>
-                        <field name="done_by" string=""/>
-                        <field name="lase_click_date" string=""/>
                         <field name="comment" string=""/>
                         <field name="approval_state" string=""/>
+                        <field name="done_by" string=""/>
+                        <field name="lase_click_date" string=""/>
                         <field name="node_btn_name" string="" groups="soong_workflow.group_soong_workflow_manager"/>
                         <field name="document_ids" string="" widget="preview_many2many"/>
                     </tree>
@@ -72,9 +72,9 @@
                         <field name="sequence" string="" column_invisible="1"/>
                         <field name="name" string=""/>
                         <field name="comment" string=""/>
+                        <field name="approval_state" string=""/>
                         <field name="done_by" string=""/>
                         <field name="lase_click_date" string=""/>
-                        <field name="approval_state" string=""/>
                         <field name="document_ids" string="" widget="preview_many2many"/>
                         <field name="node_btn_name" string=""/>
                     </tree>