diff --git a/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/security/SecuredKeyCloakConfiguration.java b/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/security/SecuredKeyCloakConfiguration.java
index 4ebd8ce5b..077b32df9 100644
--- a/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/security/SecuredKeyCloakConfiguration.java
+++ b/persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/security/SecuredKeyCloakConfiguration.java
@@ -76,11 +76,9 @@ public class SecuredKeyCloakConfiguration extends KeycloakWebSecurityConfigurerA
 
         web.ignoring().antMatchers("/actuator/health/**",
                 "/redaction-gateway-v1/async/download/with-ott/**",
-                "/api/async/download/with-ott/**",
-                "/api/docs",
-                "/api/docs/**",
-                "/",
-                "/api",
+                "/redaction-gateway-v1/docs/**",
+                "/redaction-gateway-v1/docs",
+                "/redaction-gateway-v1",
                 "/internal-api/**");
 
         web.ignoring().antMatchers(HttpMethod.OPTIONS, "/**");
diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/service/GeneralConfigurationService.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/service/GeneralConfigurationService.java
index 22b649b82..c3d90ac60 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/service/GeneralConfigurationService.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/service/GeneralConfigurationService.java
@@ -38,7 +38,7 @@ public class GeneralConfigurationService {
         return GeneralConfigurationModel.builder()
                 .auxiliaryName(auxiliaryName)
                 .displayName(realm.getDisplayNameHtml())
-                .forgotPasswordFunctionEnabled(realm.isResetPasswordAllowed())
+                .forgotPasswordFunctionEnabled(realm.isResetPasswordAllowed() != null && realm.isResetPasswordAllowed())
                 .build();
     }
 
diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java
index f578a86df..4376f8e69 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerAutoConfiguration.java
@@ -50,7 +50,6 @@ public class SwaggerAutoConfiguration {
     private static final String DESCRIPTION = "Description for redaction";
     private static final String VERSION = "1.0";
     private static final String OAUTH_NAME = "RED-OAUTH";
-
     private static final String PROTOCOL_URL_FORMAT = "/auth/realms/%s/protocol/openid-connect";
 
     @Autowired
diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerHomeController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerHomeController.java
index 28b4129ae..e5ce93aa4 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerHomeController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/swagger/SwaggerHomeController.java
@@ -29,10 +29,10 @@ public class SwaggerHomeController {
     }
 
 
-    @GetMapping({"/api", "/"})
+    @GetMapping({"/redaction-gateway-v1", "/","redaction-gateway-v1/docs"})
     public void home(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
-        response.sendRedirect(contextPath + "/api/docs/swagger-ui");
+        response.sendRedirect(contextPath + "/redaction-gateway-v1/docs/swagger-ui");
     }
 
 }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml
index 696e6ca69..9ecfa872f 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml
@@ -61,7 +61,7 @@ commons:
   keycloak:
     applicationClientId: redaction
     clientId: redaction-system
-    clientSecret: NSQmQWTBAPH4HwJXIFQQdazigWP8EHgg
+    clientSecret: G5E1qLU8ZNdDv7HY5BNLPdt5nXdeF7cU
     realm: redaction
     serverUrl: http://localhost:8080
     issuer: ''
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 099f39d81..94c122812 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
@@ -154,11 +154,11 @@ commons:
 
 springdoc:
   swagger-ui:
-    path: /api/docs/swagger-ui
+    path: /redaction-gateway-v1/docs/swagger-ui
     operations-sorter: alpha
     tags-sorter: alpha
   api-docs:
-    path: /api/docs
+    path: /redaction-gateway-v1/docs
   pre-loading-enabled: true
   packages-to-scan: ['com.iqser.red.persistence.service.v1.external.api']