diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 39309d8..82c6e0a 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -24,7 +24,7 @@
 rest:
     api:
         cps-base-path: /cps/api
-        ncmp-base-path: /cps-ncmp/api
+        ncmp-base-path: /ncmp
 
 spring:
     main:
@@ -84,12 +84,17 @@
 
 springdoc:
     swagger-ui:
-        url: /openapi.yml
-        path: /swagger-ui/index.html
+        disable-swagger-default-url: true
+        urlsPrimaryName: cps-core
+        urls:
+            - name: cps-core
+              url: /api-docs/cps-core/openapi.yaml
+            - name: cps-ncmp
+              url: /api-docs/cps-ncmp/openapi.yaml
 
 security:
     # comma-separated uri patterns which do not require authorization
-    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
+    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/api-docs
     auth:
         username: ${CPS_USERNAME}
         password: ${CPS_PASSWORD}