diff --git a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DossierInternalController.java b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DossierInternalController.java
index 47ac2119f..a25cf20a6 100644
--- a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DossierInternalController.java
+++ b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/DossierInternalController.java
@@ -11,6 +11,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.Dossier
 import com.iqser.red.service.persistence.service.v1.api.internal.resources.DossierResource;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
+import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
 
 import feign.Param;
 import jakarta.transaction.Transactional;
@@ -48,6 +49,11 @@ public class DossierInternalController implements DossierResource {
     @Transactional
     public Dossier createDossier(@RequestBody CreateOrUpdateDossierRequest dossierRequest) {
 
+        if (dossierRequest.getOwnerId().equals("internal_user")) {
+            dossierRequest.setOwnerId(KeycloakSecurity.getUserId());
+//            dossierRequest.setOwnerId(KeycloakSecurity.getUserId());
+//            dossierRequest.setOwnerId(KeycloakSecurity.getUserId());
+        }
         return dossierManagementService.createDossier(dossierRequest);
     }
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/UploadManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/UploadManagementService.java
index e5502f5a7..ef69e2c98 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/UploadManagementService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/UploadManagementService.java
@@ -36,7 +36,6 @@ public class UploadManagementService {
     private static final double THRESHOLD_RATIO = 10;        // Max allowed compression ratio
 
     private final UploadService uploadService;
-    private final AccessControlService accessControlService;
     private final FileFormatValidationService fileFormatValidationService;