diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml
index f7d68f08b19..0d36e28990b 100644
--- a/admin/admin-service/pom.xml
+++ b/admin/admin-service/pom.xml
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
-			<version>5.2.5</version>
+			<version>5.3.0</version>
 		</dependency>
 		<dependency>
 		  <groupId>org.springframework.batch.extensions</groupId>
@@ -140,7 +140,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.5.0</version>
+			<version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.commons</groupId>
diff --git a/admin/hotlist-service/pom.xml b/admin/hotlist-service/pom.xml
index 269faee2449..be9d8980319 100644
--- a/admin/hotlist-service/pom.xml
+++ b/admin/hotlist-service/pom.xml
@@ -12,7 +12,7 @@
 
 		<!-- common properties -->
 		<java.version>21</java.version>
-		<postgresql.version>42.2.2</postgresql.version>
+		<postgresql.version>42.3.3</postgresql.version>
 		<maven.jacoco.version>0.8.11</maven.jacoco.version>
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 
@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.5.0</version>
+			<version>2.6.0</version>
 		</dependency>
 	</dependencies>
 	<distributionManagement>
diff --git a/admin/kernel-masterdata-service/pom.xml b/admin/kernel-masterdata-service/pom.xml
index ba6044e3aac..01f4a60ce1b 100644
--- a/admin/kernel-masterdata-service/pom.xml
+++ b/admin/kernel-masterdata-service/pom.xml
@@ -171,7 +171,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.5.0</version>
+			<version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/HolidayServiceImpl.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/HolidayServiceImpl.java
index 2f002e3deb0..964b8ebb6e0 100644
--- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/HolidayServiceImpl.java
+++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/HolidayServiceImpl.java
@@ -89,7 +89,7 @@ public class HolidayServiceImpl implements HolidayService {
 	@Autowired
 	private AuditUtil auditUtil;
 
-	private static final String UPDATE_HOLIDAY_QUERY = "UPDATE Holiday h SET h.updatedBy = :updatedBy , h.updatedDateTime = :updatedDateTime, h.holidayDesc = :holidayDesc,h.holidayId.holidayDate=:holidayDate,h.holidayId.holidayName = :holidayName   WHERE h.holidayId.locationCode = :locationCode  and h.holidayId.holidayId = :holidayId and h.holidayId.langCode = :langCode and (h.isDeleted is null or h.isDeleted = false)";
+	private static final String UPDATE_HOLIDAY_QUERY = "UPDATE Holiday h SET h.updatedBy = :updatedBy , h.updatedDateTime = :updatedDateTime, h.holidayDesc = :holidayDesc, h.holidayDate= :holidayDate, h.holidayName = :holidayName   WHERE h.locationCode = :locationCode and h.holidayId = :holidayId and h.langCode = :langCode and (h.isDeleted is null or h.isDeleted = false)";
 	private static final int DEFAULT_HOLIDAY_ID = 2000001;
 
 	/*
diff --git a/admin/kernel-syncdata-service/pom.xml b/admin/kernel-syncdata-service/pom.xml
index 7cf904f162e..ffaeb46d5d4 100644
--- a/admin/kernel-syncdata-service/pom.xml
+++ b/admin/kernel-syncdata-service/pom.xml
@@ -247,7 +247,7 @@
 		<dependency>
 		    <groupId>org.springdoc</groupId>
 		    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-		    <version>2.5.0</version>
+		    <version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/apitest/src/main/resources/config/Kernel.properties b/apitest/src/main/resources/config/Kernel.properties
index e869e180054..05d29216474 100644
--- a/apitest/src/main/resources/config/Kernel.properties
+++ b/apitest/src/main/resources/config/Kernel.properties
@@ -136,17 +136,17 @@ AuthClientID = mosip-resident-client
 
 #---------------------------------- Client Secret Keys -----------------------#
 #-- When test rig ran in docker, these values dervied from the environment ---#
-mosip_partner_client_secret = vXS7WUyPDpfWYuoz
-mosip_pms_client_secret = 5Qj8vn989OL1Vlu6
-mosip_resident_client_secret = SnZQ6nnVwN9YWvdM
-mosip_idrepo_client_secret = AeM2TwFuuZygCuvO
-mosip_reg_client_secret = DLXygc82rkAkjrwV
-mosip_admin_client_secret = Styop9nqkshXMTgj
-mosip_hotlist_client_secret = TKyc4cqWymxjiLEsVydX4uME1xU3i9xl
-mosip_regproc_client_secret = eyeXdyhO0u2ETibw
-mpartner_default_mobile_secret = iCkj8BRZU6hP6MAN
-mosip_testrig_client_secret = AonuXbikoWmHP5ug
-AuthClientSecret = SnZQ6nnVwN9YWvdM
+mosip_partner_client_secret = 
+mosip_pms_client_secret = 
+mosip_resident_client_secret = 
+mosip_idrepo_client_secret = 
+mosip_reg_client_secret = 
+mosip_admin_client_secret = 
+mosip_hotlist_client_secret = 
+mosip_regproc_client_secret = 
+mpartner_default_mobile_secret = 
+mosip_testrig_client_secret = 
+AuthClientSecret = 
 
 
 
@@ -256,6 +256,7 @@ admin_password=mosip123
 admin_userName=220005
 admin_zone_password=mosip123
 admin_zone_userName=globaladmin
+mockNotificationChannel=email,phone
 
 
 
@@ -270,10 +271,6 @@ langselect=0
 
 #----------------------------------AuthDemoService Host properties----------------------------------------------------------#
 #Uncommemnt the below to run locally
-authDemoServiceBaseURL=http://localhost
-authDemoServicePort=8082
-authCertsPath=
+#authCertsPath=
 #Uncommemnt the below to run in Docker
-#authDemoServiceBaseURL=http://authdemo.apitestrig
-#authDemoServicePort=80
-#authCertsPath=/home/mosip/authcerts
+authCertsPath=/home/mosip/authcerts
diff --git a/apitest/src/main/resources/masterdata/GetRegistrationMachineUserMappingHistory/GetRegistrationMachineUserMappingHistory.yml b/apitest/src/main/resources/masterdata/GetRegistrationMachineUserMappingHistory/Getregistrationmachineusermappinghistory.yml
similarity index 100%
rename from apitest/src/main/resources/masterdata/GetRegistrationMachineUserMappingHistory/GetRegistrationMachineUserMappingHistory.yml
rename to apitest/src/main/resources/masterdata/GetRegistrationMachineUserMappingHistory/Getregistrationmachineusermappinghistory.yml
diff --git a/apitest/src/main/resources/masterdata/UserCenterMapping/UpdateUserCenterMapping.yml b/apitest/src/main/resources/masterdata/UserCenterMapping/UpdateUserCenterMapping.yml
index 9e8fc91457a..482a39bd993 100644
--- a/apitest/src/main/resources/masterdata/UserCenterMapping/UpdateUserCenterMapping.yml
+++ b/apitest/src/main/resources/masterdata/UserCenterMapping/UpdateUserCenterMapping.yml
@@ -19,7 +19,7 @@ UpdateUserCenterMapping:
     "name": "automationUpdated",
     "statusCode": "active",
     "regCenterId": "$IGNORE$",
-    "zoneCode": "RBT",
+    "zoneCode": "$IGNORE$",
     "zoneName": "$IGNORE$",
     "regCenterName": "HSR Center updated"
     }'
@@ -70,4 +70,4 @@ UpdateUserCenterMapping:
       "message": "Registration Center not found"
     }
   ]
-}'
\ No newline at end of file
+}'
diff --git a/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_rollback.sql b/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_rollback.sql
new file mode 100644
index 00000000000..5b41710b0a5
--- /dev/null
+++ b/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_rollback.sql
@@ -0,0 +1,20 @@
+-- ------------------------------------------------------------------------------------------
+-- Rollback script for Migrating Spring batch version to 5.0 as part of Java 21 Migration.
+-- ------------------------------------------------------------------------------------------
+
+ALTER TABLE master.BATCH_STEP_EXECUTION DROP COLUMN CREATE_TIME;
+ALTER TABLE master.BATCH_STEP_EXECUTION ALTER COLUMN START_TIME SET NOT NULL;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN DATE_VAL DATE;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN LONG_VAL BIGINT;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN DOUBLE_VAL DOUBLE PRECISION;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_TYPE TO TYPE_CD;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN TYPE_CD TYPE VARCHAR(6);
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_NAME TO KEY_NAME;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN KEY_NAME TYPE VARCHAR(100);
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_VALUE TO STRING_VAL;
+ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN STRING_VAL TYPE VARCHAR(250);
+ALTER TABLE master.BATCH_JOB_EXECUTION ADD COLUMN JOB_CONFIGURATION_LOCATION VARCHAR(2500);
+
+DROP SEQUENCE master.BATCH_STEP_EXECUTION_SEQ;
+DROP SEQUENCE master.BATCH_JOB_EXECUTION_SEQ;
+DROP SEQUENCE master.BATCH_JOB_SEQ;
diff --git a/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_upgrade.sql b/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_upgrade.sql
new file mode 100644
index 00000000000..5667e8d55af
--- /dev/null
+++ b/db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_upgrade.sql
@@ -0,0 +1,20 @@
+-- ------------------------------------------------------------------------------------------
+-- Upgrade script for Migrating Spring batch version to 5.0 as part of Java 21 Migration.
+-- ------------------------------------------------------------------------------------------
+
+ALTER TABLE  master.BATCH_STEP_EXECUTION ADD CREATE_TIME TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00';
+ALTER TABLE  master.BATCH_STEP_EXECUTION ALTER COLUMN START_TIME DROP NOT NULL;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN TYPE_CD TYPE VARCHAR(100);
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS RENAME TYPE_CD TO PARAMETER_TYPE;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN KEY_NAME TYPE VARCHAR(100);
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS RENAME KEY_NAME TO PARAMETER_NAME;
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN STRING_VAL TYPE VARCHAR(2500);
+ALTER TABLE  master.BATCH_JOB_EXECUTION_PARAMS RENAME STRING_VAL TO PARAMETER_VALUE;
+ALTER TABLE  master.BATCH_JOB_EXECUTION DROP COLUMN JOB_CONFIGURATION_LOCATION;
+
+CREATE SEQUENCE  master.BATCH_STEP_EXECUTION_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
+CREATE SEQUENCE  master.BATCH_JOB_EXECUTION_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
+CREATE SEQUENCE  master.BATCH_JOB_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
diff --git a/deploy/copy_cm.sh b/deploy/copy_cm.sh
index 3ea1d8b99eb..fb2d70a66ab 100755
--- a/deploy/copy_cm.sh
+++ b/deploy/copy_cm.sh
@@ -3,7 +3,7 @@
 # DST_NS: Destination namespace 
 
 function copying_cm() {
-  UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
+  UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
   COPY_UTIL=./copy_cm_func.sh
   DST_NS=admin
 
diff --git a/deploy/copy_cm_kernel.sh b/deploy/copy_cm_kernel.sh
index 87442932e2a..a861de8b505 100755
--- a/deploy/copy_cm_kernel.sh
+++ b/deploy/copy_cm_kernel.sh
@@ -3,7 +3,7 @@
 # DST_NS: Destination namespace 
 
 function copying_cm() {
-  UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
+  UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
   COPY_UTIL=./copy_cm_func.sh
   DST_NS=kernel