diff --git a/.java-version b/.java-version
index 62593409..7f83a844 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.8
+17.0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f7b57a56..037237cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,17 +170,17 @@
 		</dependency>
 
 
-		<!--<dependency>
+		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.16.1</version>
+			<version>2.17.2</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>org.json</artifactId>
 					<groupId>json</groupId>
 				</exclusion>
 			</exclusions>
-		</dependency>-->
+		</dependency>
 
 		<dependency>
 			<groupId>org.json</groupId>
@@ -261,7 +261,7 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.3.0</version>
+			<version>2.6.0</version>
 
 		</dependency>
 
@@ -415,7 +415,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
-			<version>5.2.5</version>
+			<version>5.3.0</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>org.apache.xmlgraphics</artifactId>
@@ -453,7 +453,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>6.1.6</version>
+			<version>6.1.12</version>
 		</dependency>
 		
     <dependency>
@@ -466,7 +466,7 @@
     <dependency>
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-common</artifactId>
-        <version>2.30.1</version>
+        <version>3.1.8</version>
     </dependency>
     <dependency>
         <groupId>org.glassfish.jersey.core</groupId>
@@ -493,8 +493,17 @@
 	</dependencies>
 
 	<build>
-		<finalName>commonapi-v1.0</finalName>
+		<finalName>commonapi-v3.0.0</finalName>
 		<plugins>
+			<plugin>
+				<groupId>org.owasp</groupId>
+				<artifactId>dependency-check-maven</artifactId>
+				<version>10.0.3</version>
+				<configuration>
+					<format>HTML</format>
+					<nvdApiServerId>nvd</nvdApiServerId>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
index 322c371f..97b0fc11 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
@@ -198,7 +198,7 @@ private void addCreatedDateToOtherFields(BeneficiaryModel beneficiaryModel) {
 				JsonNode otherFieldsNode = objectMapper.readTree(beneficiaryModel.getOtherFields());
 
 				// Convert createdDate to a string
-				String createdDateString = beneficiaryModel.getCreatedDate().toString(); 
+				String createdDateString = beneficiaryModel.getCreatedDate().toString();
 
 				// Add createdDate to the JSON node
 				((ObjectNode) otherFieldsNode).put("createdDate", createdDateString);
@@ -219,10 +219,9 @@ public List<BeneficiaryModel> userExitsCheckWithHealthId_ABHAId(String healthID,
 		List<BeneficiaryModel> beneficiaryList = new ArrayList<BeneficiaryModel>();
 		// search patient by ben id, call Identity API
 		List<BeneficiariesDTO> listBen = null;
-		if(healthID.contains("@")) {
-			listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID,
-					auth, is1097);
-		}else {
+		if (healthID.contains("@")) {
+			listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID, auth, is1097);
+		} else {
 			String healthIdNumber = getHealthId(healthID);
 			listBen = identityBeneficiaryService.getBeneficiaryListByHealthIDNo_ABHAIDNo(healthIdNumber, auth, is1097);
 		}
@@ -232,6 +231,7 @@ public List<BeneficiaryModel> userExitsCheckWithHealthId_ABHAId(String healthID,
 		}
 		return beneficiaryList;
 	}
+
 	private String getHealthId(String healthID) {
 		String healthIdNumber = null;
 		if (null != healthID) {
@@ -249,6 +249,7 @@ private String getHealthId(String healthID) {
 		}
 		return healthIdNumber;
 	}
+
 	// search patient by healthidNo / ABHA Id No
 	@Override
 	public List<BeneficiaryModel> userExitsCheckWithHealthIdNo_ABHAIdNo(String healthIDNo, String auth, Boolean is1097)
@@ -372,7 +373,8 @@ public List<BeneficiaryModel> getBeneficiaryListFromMapper(List<BeneficiariesDTO
 		benDetailForOutboundDTOList.forEach(beneficiaryModel -> {
 
 			BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel);
-			if (beneficiary.getAge() == 0) {
+
+			if (beneficiary.getAge() == null && beneficiary.getActualAge() != null) {
 				beneficiary.setAge(beneficiary.getActualAge());
 			}
 			beneficiary.setBenPhoneMaps(benPhoneMapper.benPhoneMapToResponseByID(beneficiaryModel));
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index db5021b4..566366f5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,8 +15,8 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jackson.serialization.fail-on-empty-beans=false
 spring.jpa.hibernate.show_sql=true
 spring.jpa.hibernate.format_sql=true
-spring.http.multipart.max-request-size=1000MB
-spring.http.multipart.max-file-size=1000MB
+spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.max-file-size=1000MB
 
 ##sms details for CHO
 CHOSmsTemplate= CHO UPTSU SMS