diff --git a/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/UserListingService.java b/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/UserListingService.java
index ac234c242..379738085 100644
--- a/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/UserListingService.java
+++ b/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/UserListingService.java
@@ -36,10 +36,6 @@ public class UserListingService {
     @Cacheable(value = USERS_CACHE, key = "'tenantId'")
     public List<User> getAllUsers(String tenantId) {
 
-        if(tenantId == "master"){
-            return new ArrayList<>();
-        }
-
         return retryTemplate.execute(context -> {
 
             var realm = realmService.realm(tenantId);
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
index 258ef16e5..21e41940f 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
@@ -139,7 +139,7 @@ keycloak:
 
 commons:
   keycloak:
-    applicationClientId: ${keycloak.resource:redaction-system}
+    applicationClientId: ${keycloak.resource:redaction}
     clientId: ${keycloak.client.id}
     clientSecret: ${keycloak.client.secret}
     realm: ${keycloak.realm}
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
index 80532da41..89f7723fd 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
@@ -10,7 +10,6 @@ import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.junit.Ignore;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +31,7 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
 
     @SneakyThrows
     @Test
+    @Disabled
     public void testDossierTemplateImport() {
 
         var importDir = new File("/Users/timobejan/work/dossier-templates-v2/dev");