diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 187353e..bd954b7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,7 +9,8 @@ env:
   REGISTRY: docker.frappet.com
   IMAGE_NAME: ehr/bma-ehr-salary-service
   DEPLOY_HOST: frappet.com
-  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-salary
+  COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-salary
 jobs:
   # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=version-1.0.36 -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357
   release-test:
diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 9f7ff21..19ac180 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1666,7 +1666,7 @@ export class ReportController extends Controller {
           salaryPeriodId: salaryPeriodId,
         },
         type: In(["HAFT", "FULL", "FULLHAFT"]),
-        isRetired: false, //กรองเฉพาะคนที่ไม่เกษียณ
+        isRetired: salaryPeriod.period === "APR" ? In([true, false]) : false, //กรองเฉพาะคนที่ไม่เกษียณเฉพาะรอบตุลา
       },
       order: {
         salaryOrg: {
@@ -1846,8 +1846,8 @@ export class ReportController extends Controller {
     });
 
     return new HttpSuccess({
-      template: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04",
-      reportName: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04",
+      template: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04-01",
+      reportName: salaryPeriod.period == "APR" ? "gov1-04" : "gov2-04-01",
       data: {
         year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
         effectiveDate: salaryPeriod.effectiveDate,
@@ -2036,8 +2036,8 @@ export class ReportController extends Controller {
     });
 
     return new HttpSuccess({
-      template: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05",
-      reportName: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05",
+      template: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05-01",
+      reportName: salaryPeriod.period == "APR" ? "gov1-05" : "gov2-05-01",
       data: {
         year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
         agency: root,
@@ -2302,7 +2302,7 @@ export class ReportController extends Controller {
       },
       relations: ["salaryProfiles"],
     });
-   
+
     const salaryProfileSpecial = await this.salaryProfileRepository.find({
       relations: ["salaryOrg"],
       where: {