diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
index 7db4dd501..12e5b973c 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java
@@ -83,6 +83,7 @@ public class DownloadController implements DownloadResource {
     private String storageBackend;
 
 
+    @Deprecated(forRemoval = true)
     @PreAuthorize("hasAuthority('" + PROCESS_DOWNLOAD + "')")
     public DownloadResponse prepareDownload(@RequestBody PrepareDownloadRequest request) {
 
@@ -94,12 +95,12 @@ public class DownloadController implements DownloadResource {
         accessControlService.verifyUserIsDossierOwnerOrApprover(request.getDossierId());
         var response = downloadService.prepareDownload(convert(request));
         auditPersistenceService.insertRecord(AuditRequest.builder()
-                .userId(KeycloakSecurity.getUserId())
-                .objectId(response.getValue())
-                .category(AuditCategory.DOWNLOAD.name())
-                .message("Download was prepared")
-                .details(Map.of("dossierId", request.getDossierId()))
-                .build());
+                                                     .userId(KeycloakSecurity.getUserId())
+                                                     .objectId(response.getValue())
+                                                     .category(AuditCategory.DOWNLOAD.name())
+                                                     .message("Download was prepared")
+                                                     .details(Map.of("dossierId", request.getDossierId()))
+                                                     .build());
         return new DownloadResponse(response.getValue());
     }
 
diff --git a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DownloadResource.java b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DownloadResource.java
index 9d01f6ab1..32454dea9 100644
--- a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DownloadResource.java
+++ b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/DownloadResource.java
@@ -35,6 +35,7 @@ public interface DownloadResource {
     String OTT_PATH = "/with-ott";
 
 
+    @Deprecated(forRemoval = true)
     @Operation(summary = "Prepares a download for given fileIds and types", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Success."), @ApiResponse(responseCode = "400", description = "Request contains error."), @ApiResponse(responseCode = "404", description = "Dossier or file not found.")})
     @PostMapping(value = REST_PATH + "/prepare", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java
index 7e928905a..c67697144 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java
@@ -86,7 +86,7 @@ public class DownloadTest extends AbstractPersistenceServerServiceTest {
         assertThat(file22.getWorkflowStatus()).isEqualTo(WorkflowStatus.APPROVED);
 
         try {
-            downloadClient.prepareDownload(PrepareDownloadRequest.builder().dossierId(dossier.getId()).fileIds(List.of(file.getId(), file2.getId())).build());
+            downloadClient.prepareDownload(PrepareDownloadWithOptionRequest.builder().dossierId(dossier.getId()).fileIds(List.of(file.getId(), file2.getId())).build());
         } catch (FeignException e) {
             assertThat(e.status()).isEqualTo(400);
         }