diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java
index 09ab574b4..922506475 100644
--- a/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java
+++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/PrincipalController.java
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping(path = "api/principal", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(path = "api/annotation/principal", produces = MediaType.APPLICATION_JSON_VALUE)
 public class PrincipalController {
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(PrincipalController.class));
 	private final AuditService auditService;
diff --git a/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java
index a8c6f2b18..064600f53 100644
--- a/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java
+++ b/annotation-service/annotation-web/src/main/java/gr/cite/annotation/web/controllers/TenantConfigurationController.java
@@ -34,7 +34,7 @@ import javax.management.InvalidApplicationException;
 import java.util.*;
 
 @RestController
-@RequestMapping(path = "api/notification/tenant-configuration")
+@RequestMapping(path = "api/annotation/tenant-configuration")
 public class TenantConfigurationController {
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(TenantConfigurationController.class));
 
diff --git a/annotation-service/annotation-web/src/main/resources/config/tenant.yml b/annotation-service/annotation-web/src/main/resources/config/tenant.yml
index 1b389e623..5325de856 100644
--- a/annotation-service/annotation-web/src/main/resources/config/tenant.yml
+++ b/annotation-service/annotation-web/src/main/resources/config/tenant.yml
@@ -4,4 +4,4 @@ tenant:
   interceptor:
     white-listed-clients: [ ]
     enforce-trusted-tenant: false
-    white-listed-endpoints: [ '/api/principal/me' ]
\ No newline at end of file
+    white-listed-endpoints: [ '/api/annotation/principal/me' ]
\ No newline at end of file
diff --git a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
index 4ec5aee6b..49d0c7a99 100644
--- a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
+++ b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
@@ -38,7 +38,7 @@ import jakarta.transaction.Transactional;
 import java.util.*;
 
 @RestController
-@RequestMapping(path = "api/inapp-notification")
+@RequestMapping(path = "api/notification/inapp-notification")
 public class InAppNotificationController {
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(InAppNotificationController.class));
 
diff --git a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
index 807e71d3e..187fa9fca 100644
--- a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
+++ b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
@@ -33,7 +33,7 @@ import jakarta.transaction.Transactional;
 import java.util.*;
 
 @RestController
-@RequestMapping(path = "api/notification-template")
+@RequestMapping(path = "api/notification/notification-template")
 public class NotificationTemplateController {
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(NotificationTemplateController.class));
 
diff --git a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
index b51055511..21438e8cd 100644
--- a/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
+++ b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping(path = "api/principal", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(path = "api/notification/principal", produces = MediaType.APPLICATION_JSON_VALUE)
 public class PrincipalController {
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(PrincipalController.class));
 	private final AuditService auditService;
diff --git a/notification-service/notification-web/src/main/resources/config/tenant.yml b/notification-service/notification-web/src/main/resources/config/tenant.yml
index 1b389e623..11cb03a00 100644
--- a/notification-service/notification-web/src/main/resources/config/tenant.yml
+++ b/notification-service/notification-web/src/main/resources/config/tenant.yml
@@ -4,4 +4,4 @@ tenant:
   interceptor:
     white-listed-clients: [ ]
     enforce-trusted-tenant: false
-    white-listed-endpoints: [ '/api/principal/me' ]
\ No newline at end of file
+    white-listed-endpoints: [ '/api/notification/principal/me' ]
\ No newline at end of file