diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java
index 55884642..3d1f211e 100644
--- a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java
+++ b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java
@@ -105,10 +105,10 @@ public String dataSyncToServer(@RequestBody String requestOBJ,
 	@PostMapping(value = { "/diagnostic-documents-to-server" })
 	public String diagnosticDocumentsToServer(@RequestHeader(value = "Authorization") String authorization,
 			@RequestHeader(value = "ServerAuthorization") String serverAuthorization,
-			@RequestParam Long villageId) {
+			@RequestParam(required = false) Long villageId) {
 		OutputResponse response = new OutputResponse();
 		try {
-			String s = diagnosticDocumentPushServiceImpl.pushPendingDocuments(serverAuthorization, villageId);
+			String s = diagnosticDocumentPushServiceImpl.pushPendingDocuments(serverAuthorization);
 			if (s != null)
 				response.setResponse(s);
 			else
diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentIngestService.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentIngestService.java
index 507ff235..81fa0acf 100644
--- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentIngestService.java
+++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentIngestService.java
@@ -80,16 +80,16 @@ private Map<String, Object> ingestOne(Map<String, Object> item) {
 			}
 
 			Long beneficiaryId = asLong(item.get("beneficiaryId"));
-			Long villageId = asLong(item.get("villageId"));
+			Long vanId = asLong(item.get("vanID"));
 			String orderType = (String) item.get("orderType");
 			String storedFileName = (String) item.get("storedFileName");
-			if (villageId == null || beneficiaryId == null || orderType == null || documentType == null
+			if (vanId == null || beneficiaryId == null || orderType == null || documentType == null
 					|| storedFileName == null) {
 				ack.put("status", "FAILED");
-				ack.put("error", "Missing villageId, beneficiaryId, orderType, documentType or storedFileName");
+				ack.put("error", "Missing vanID, beneficiaryId, orderType, documentType or storedFileName");
 				return ack;
 			}
-			String s3Key = villageId + "/" + beneficiaryId + "/" + orderType + "/" + documentType + "/"
+			String s3Key = vanId + "/" + beneficiaryId + "/" + orderType + "/" + documentType + "/"
 					+ storedFileName;
 			String contentType = (String) item.get("contentType");
 
diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentPushServiceImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentPushServiceImpl.java
index 9374d93b..6a5a9c00 100644
--- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentPushServiceImpl.java
+++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DiagnosticDocumentPushServiceImpl.java
@@ -66,7 +66,7 @@ public class DiagnosticDocumentPushServiceImpl {
 	@Autowired
 	private CryptoUtil cryptoUtil;
 
-	public String pushPendingDocuments(String Authorization, Long villageId) throws Exception {
+	public String pushPendingDocuments(String Authorization) throws Exception {
 		List<Map<String, Object>> pendingRows = diagnosticDocumentRepository.findPendingDocuments();
 		boolean anyRowsFound = !pendingRows.isEmpty();
 		int totalAttempted = 0;
@@ -118,7 +118,6 @@ public String pushPendingDocuments(String Authorization, Long villageId) throws
 				item.put("vanID", row.get("vanID"));
 				item.put("parkingPlaceID", row.get("parkingPlaceID"));
 				item.put("vanSerialNo", row.get("vanSerialNo"));
-				item.put("villageId", villageId);
 				item.put("fileContentBase64", base64Plaintext);
 				payloadItems.add(item);
 				rowsById.put(rowId, row);