diff --git a/.github/workflows/build-and-commit-assets.yml b/.github/workflows/build-and-commit-assets.yml
index 11ffc911da..059a5d27f1 100644
--- a/.github/workflows/build-and-commit-assets.yml
+++ b/.github/workflows/build-and-commit-assets.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Package assets
         working-directory: apps/hrms
-        run: tar czf hrms-assets.tar.gz -C ../../sites/assets/hrms dist frontend roster
+        run: tar czf hrms-assets.tar.gz -C ../../sites/assets/hrms dist -C "$PWD/hrms/public" frontend roster
 
       - name: Upload to rolling release
         working-directory: apps/hrms
diff --git a/hrms/payroll/doctype/employee_incentive/employee_incentive.js b/hrms/payroll/doctype/employee_incentive/employee_incentive.js
index 49de854752..1694eb6980 100644
--- a/hrms/payroll/doctype/employee_incentive/employee_incentive.js
+++ b/hrms/payroll/doctype/employee_incentive/employee_incentive.js
@@ -47,7 +47,8 @@ frappe.ui.form.on("Employee Incentive", {
 		if (!frm.doc.company) return;
 		frm.set_query("salary_component", function () {
 			return {
-				filters: { type: "earning" },
+				filters: { component_type: "Earning", company: frm.doc.company },
+				query: "hrms.payroll.doctype.salary_structure.salary_structure.get_salary_component",
 			};
 		});
 	},