diff --git a/l10n_pe_hr_payroll/data/base.xml b/l10n_pe_hr_payroll/data/base.xml
index 735a4bf3..cdea1281 100644
--- a/l10n_pe_hr_payroll/data/base.xml
+++ b/l10n_pe_hr_payroll/data/base.xml
@@ -114,8 +114,8 @@
         <field name="condition_python">result = inputs.EXTRA.amount > 0.0 if inputs.EXTRA else False</field>
         <field name="amount_select">code</field>
         <field name="amount_python_compute">result = inputs.EXTRA.amount if inputs.EXTRA else 0</field>
-        <field name="code">BASIC_EXTRA</field>
-        <field name="category_id" ref="hr_payroll.BASIC"/>
+        <field name="code">ALW_EXTRA</field>
+        <field name="category_id" ref="hr_payroll.ALW"/>
         <field name="name">Extraordinary Wage</field>
         <field name="sequence" eval="24"/>
         <field name="struct_id" ref="l10n_pe_hr_payroll.hr_payroll_structure"/>
diff --git a/l10n_pe_hr_payroll_account/models/account_chart_template.py b/l10n_pe_hr_payroll_account/models/account_chart_template.py
index e2b58539..fc104886 100644
--- a/l10n_pe_hr_payroll_account/models/account_chart_template.py
+++ b/l10n_pe_hr_payroll_account/models/account_chart_template.py
@@ -125,12 +125,12 @@ class AccountChartTemplate(models.Model):
 
             # BASIC* -> SALARY_EXPENSE debit account
             set_rule_accounts('BASIC%', accounts[exp_salary], accounts['none'])
-            set_rule_accounts('BASIC_EXTRA%', accounts[exp_extra], accounts['none'])
             # ALW* -> SALARY_EXPENSE debit account
             set_rule_accounts('ALW%', accounts[exp_salary], accounts['none'])
-            set_rule_accounts('ALW_COM%', accounts[exp_com], accounts['none'])
             set_rule_accounts('ALW_BONO%', accounts[exp_bono], accounts['none'])
             set_rule_accounts('ALW_BADGES%', accounts[exp_bono], accounts['none'])
+            set_rule_accounts('ALW_COM%', accounts[exp_com], accounts['none'])
+            set_rule_accounts('ALW_EXTRA%', accounts[exp_extra], accounts['none'])
             # EE_* -> AP debit
             set_rule_accounts('EE_%', accounts[pay_ee], accounts['none'])  # initialize
             set_rule_accounts('EE_PE_AFP%', accounts[pay_afp], accounts['none'])