diff --git a/src/main/java/com/snp/batch/jobs/sanction/batch/reader/ComplianceDataReader.java b/src/main/java/com/snp/batch/jobs/sanction/batch/reader/ComplianceDataReader.java
index ac9efb5..e6423f1 100644
--- a/src/main/java/com/snp/batch/jobs/sanction/batch/reader/ComplianceDataReader.java
+++ b/src/main/java/com/snp/batch/jobs/sanction/batch/reader/ComplianceDataReader.java
@@ -33,7 +33,7 @@ public class ComplianceDataReader extends BaseApiReader<ComplianceDto> {
 
     @Override
     protected String getReaderName() {
-        return "ShipLastPositionDataReader";
+        return "ComplianceDataReader";
     }
 
     @Override
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2f36e2b..4987575 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -22,7 +22,7 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         format_sql: true
-        default_schema: public
+        default_schema: snp_data
 
   # Batch Configuration
   batch:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 0c1d440..267e704 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         format_sql: true
-        default_schema: public
+        default_schema: snp_data
 
   # Batch Configuration
   batch:
@@ -42,7 +42,7 @@ spring:
   quartz:
     job-store-type: jdbc  # JDBC store for schedule persistence
     jdbc:
-      initialize-schema: always  # Create Quartz tables if not exist
+      initialize-schema: never  # Create Quartz tables if not exist
     properties:
       org.quartz.scheduler.instanceName: SNPBatchScheduler
       org.quartz.scheduler.instanceId: AUTO
diff --git a/src/main/resources/application-qa.yml b/src/main/resources/application-qa.yml
index fa83ad1..03f8e3b 100644
--- a/src/main/resources/application-qa.yml
+++ b/src/main/resources/application-qa.yml
@@ -22,7 +22,7 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         format_sql: true
-        default_schema: public
+        default_schema: snp_data
 
   # Batch Configuration
   batch:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 05a292d..fced879 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -22,7 +22,7 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         format_sql: true
-        default_schema: public
+        default_schema: snp_data
 
   # Batch Configuration
   batch: