diff --git a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java
index dee3f49..4a1236c 100644
--- a/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java
@@ -60,10 +60,10 @@ public class RiskRepositoryImpl extends BaseJdbcRepository<RiskEntity, Long> imp
                    singleshipoperation, singleshipoperationnarrative, fleetsafety, fleetsafetynarrative, fleetpsc,
                    fleetpscnarrative, specialsurveyoverdue, specialsurveyoverduenarrative, ownerunknown, ownerunknownnarrative,
                    russianportcall, russianportcallnarrative, russianownerregistration, russianownerregistrationnarrative,
-                   russiansts, russianstsnarrative
+                   russiansts, russianstsnarrative, batch_flag
                )
                VALUES (
-                   ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+                   ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'N'
                )
                ON CONFLICT (lrno)
                DO UPDATE SET
@@ -148,7 +148,8 @@ public class RiskRepositoryImpl extends BaseJdbcRepository<RiskEntity, Long> imp
                    russianownerregistration = EXCLUDED.russianownerregistration,
                    russianownerregistrationnarrative = EXCLUDED.russianownerregistrationnarrative,
                    russiansts = EXCLUDED.russiansts,
-                   russianstsnarrative = EXCLUDED.russianstsnarrative;
+                   russianstsnarrative = EXCLUDED.russianstsnarrative,
+                   batch_flag = 'N';
                 """;
     }
 
diff --git a/src/main/java/com/snp/batch/jobs/sanction/batch/repository/ComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/sanction/batch/repository/ComplianceRepositoryImpl.java
index 0f97233..981e081 100644
--- a/src/main/java/com/snp/batch/jobs/sanction/batch/repository/ComplianceRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/sanction/batch/repository/ComplianceRepositoryImpl.java
@@ -53,10 +53,10 @@ public class ComplianceRepositoryImpl extends BaseJdbcRepository<ComplianceEntit
                       shipownerswisssanctionlist, shipowneruaesanctionlist, shipownerunsanctionlist,
                       shipsanctionedcountryportcalllast12m, shipsanctionedcountryportcalllast3m, shipsanctionedcountryportcalllast6m,
                       shipsecuritylegaldisputeevent, shipstspartnernoncompliancelast12m, shipswisssanctionlist,
-                      shipunsanctionlist
+                      shipunsanctionlist, batch_flag
                   )
                   VALUES (
-                      ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+                      ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'N'
                   )
                   ON CONFLICT (lrimoshipno)
                   DO UPDATE SET
@@ -92,7 +92,8 @@ public class ComplianceRepositoryImpl extends BaseJdbcRepository<ComplianceEntit
                       shipsecuritylegaldisputeevent = EXCLUDED.shipsecuritylegaldisputeevent,
                       shipstspartnernoncompliancelast12m = EXCLUDED.shipstspartnernoncompliancelast12m,
                       shipswisssanctionlist = EXCLUDED.shipswisssanctionlist,
-                      shipunsanctionlist = EXCLUDED.shipunsanctionlist;
+                      shipunsanctionlist = EXCLUDED.shipunsanctionlist,
+                      batch_flag = 'N';
                 """;
     }
 
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index c41f218..0c1d440 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -28,7 +28,7 @@ spring:
   batch:
     jdbc:
       table-prefix: "snp_data.batch_"
-      initialize-schema: never  # Changed to 'never' as tables already exist
+      initialize-schema: always  # Changed to 'never' as tables already exist
     job:
       enabled: false  # Prevent auto-run on startup
 
@@ -49,7 +49,7 @@ spring:
       org.quartz.threadPool.threadCount: 10
       org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX
       org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-      org.quartz.jobStore.tablePrefix: QRTZ_
+      org.quartz.jobStore.tablePrefix: snp_data.QRTZ_
       org.quartz.jobStore.isClustered: false
       org.quartz.jobStore.misfireThreshold: 60000