diff --git a/enrollment-server-domain-model/src/main/java/com/wultra/app/enrollmentserver/model/enumeration/DocumentStatus.java b/enrollment-server-domain-model/src/main/java/com/wultra/app/enrollmentserver/model/enumeration/DocumentStatus.java
index 0216fba43..5b4bf6d85 100644
--- a/enrollment-server-domain-model/src/main/java/com/wultra/app/enrollmentserver/model/enumeration/DocumentStatus.java
+++ b/enrollment-server-domain-model/src/main/java/com/wultra/app/enrollmentserver/model/enumeration/DocumentStatus.java
@@ -17,8 +17,6 @@
  */
 package com.wultra.app.enrollmentserver.model.enumeration;
 
-import com.google.common.collect.ImmutableList;
-
 import java.util.List;
 
 /**
@@ -67,7 +65,7 @@ public enum DocumentStatus {
     /**
      * All not finished statuses.
      */
-    public static final List<DocumentStatus> ALL_NOT_FINISHED = ImmutableList.of(
+    public static final List<DocumentStatus> ALL_NOT_FINISHED = List.of(
             UPLOAD_IN_PROGRESS,
             VERIFICATION_PENDING,
             VERIFICATION_IN_PROGRESS
@@ -76,7 +74,7 @@ public enum DocumentStatus {
     /**
      * All unsuccessful statuses.
      */
-    public static final List<DocumentStatus> ALL_FAILED = ImmutableList.of(
+    public static final List<DocumentStatus> ALL_FAILED = List.of(
             DISPOSED,
             REJECTED,
             FAILED
diff --git a/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java b/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java
index 87b5fc32c..9098c8eb8 100644
--- a/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java
+++ b/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/mock/provider/WultraMockDocumentVerificationProviderTest.java
@@ -17,7 +17,6 @@
  */
 package com.wultra.app.onboardingserver.docverify.mock.provider;
 
-import com.google.common.collect.ImmutableList;
 import com.wultra.app.enrollmentserver.model.enumeration.CardSide;
 import com.wultra.app.enrollmentserver.model.enumeration.DocumentType;
 import com.wultra.app.enrollmentserver.model.enumeration.DocumentVerificationStatus;
@@ -83,7 +82,7 @@ void checkDocumentUploadTest() throws Exception {
     @Test
     void submitDocumentsTest() throws Exception {
         SubmittedDocument document = createSubmittedDocument();
-        List<SubmittedDocument> documents = ImmutableList.of(document);
+        List<SubmittedDocument> documents = List.of(document);
 
         DocumentsSubmitResult result = provider.submitDocuments(ownerId, documents);
 
@@ -92,7 +91,7 @@ void submitDocumentsTest() throws Exception {
 
     @Test
     void verifyDocumentsTest() throws Exception {
-        List<String> uploadIds = ImmutableList.of("doc_1", "doc_2");
+        List<String> uploadIds = List.of("doc_1", "doc_2");
 
         DocumentsVerificationResult result = provider.verifyDocuments(ownerId, uploadIds);
         assertEquals(DocumentVerificationStatus.IN_PROGRESS, result.getStatus());
@@ -101,7 +100,7 @@ void verifyDocumentsTest() throws Exception {
 
     @Test
     void getVerificationResultTest() throws Exception {
-        List<String> uploadIds = ImmutableList.of("doc_1", "doc_2");
+        List<String> uploadIds = List.of("doc_1", "doc_2");
 
         DocumentsVerificationResult result = provider.verifyDocuments(ownerId, uploadIds);
 
@@ -134,7 +133,7 @@ void getPhotoTest() throws Exception {
 
     @Test
     void cleanupDocumentsTest() throws Exception {
-        List<String> uploadIds = ImmutableList.of("doc_1", "doc_2");
+        List<String> uploadIds = List.of("doc_1", "doc_2");
 
         provider.cleanupDocuments(ownerId, uploadIds);
     }
diff --git a/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/zenid/provider/ZenidDocumentVerificationProviderTest.java b/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/zenid/provider/ZenidDocumentVerificationProviderTest.java
index 01e0e76af..eeb771072 100644
--- a/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/zenid/provider/ZenidDocumentVerificationProviderTest.java
+++ b/enrollment-server-onboarding/src/test/java/com/wultra/app/onboardingserver/docverify/zenid/provider/ZenidDocumentVerificationProviderTest.java
@@ -17,7 +17,6 @@
  */
 package com.wultra.app.onboardingserver.docverify.zenid.provider;
 
-import com.google.common.collect.ImmutableList;
 import com.wultra.app.onboardingserver.docverify.AbstractDocumentVerificationProviderTest;
 import com.wultra.app.onboardingserver.docverify.zenid.ZenidConst;
 import com.wultra.app.onboardingserver.EnrollmentServerTestApplication;
@@ -208,7 +207,7 @@ private DocumentsSubmitResult submitDocuments(OwnerId ownerId, List<SubmittedDoc
     }
 
     private List<SubmittedDocument> createSubmittedDocuments() throws Exception {
-        return ImmutableList.of(
+        return List.of(
                 createIdCardFrontDocument(),
                 createIdCardBackDocument()
         );