diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/FeaturesController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/FeaturesController.java
index 6afe60dd9..7b0e9c652 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/FeaturesController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/FeaturesController.java
@@ -12,7 +12,7 @@
 import io.fairspace.saturn.config.properties.FeatureProperties;
 
 @RestController
-@RequestMapping("/api/features/")
+@RequestMapping("${application.basePath}/features/")
 @RequiredArgsConstructor
 public class FeaturesController {
 
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/MaintenanceController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/MaintenanceController.java
index 60a90545a..acade28c8 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/MaintenanceController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/MaintenanceController.java
@@ -10,7 +10,7 @@
 import io.fairspace.saturn.config.Services;
 
 @RestController
-@RequestMapping("/api/maintenance")
+@RequestMapping("${application.basePath}/maintenance")
 @RequiredArgsConstructor
 public class MaintenanceController {
 
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/MetadataController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/MetadataController.java
index f678e9a3b..5b8674163 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/MetadataController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/MetadataController.java
@@ -32,7 +32,7 @@
 
 @Log4j2
 @RestController
-@RequestMapping("/api/metadata/")
+@RequestMapping("${application.basePath}/metadata/")
 @RequiredArgsConstructor
 @Validated
 public class MetadataController {
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/SearchController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/SearchController.java
index 5c68b0f7c..bbea8d208 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/SearchController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/SearchController.java
@@ -13,7 +13,7 @@
 import io.fairspace.saturn.controller.dto.request.LookupSearchRequest;
 
 @RestController
-@RequestMapping("/api/search")
+@RequestMapping("${application.basePath}/search")
 @RequiredArgsConstructor
 public class SearchController {
 
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/SparqlController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/SparqlController.java
index c2296b014..7dc7a7835 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/SparqlController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/SparqlController.java
@@ -14,7 +14,7 @@
 import io.fairspace.saturn.services.views.SparqlQueryService;
 
 @RestController
-@RequestMapping("/api/rdf")
+@RequestMapping("${application.basePath}/rdf")
 @Validated
 @RequiredArgsConstructor
 public class SparqlController {
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/UserController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/UserController.java
index d570ff7ab..b77b1c8cc 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/UserController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/UserController.java
@@ -11,7 +11,7 @@
 import io.fairspace.saturn.services.users.UserService;
 
 @RestController
-@RequestMapping("/api/users/")
+@RequestMapping("${application.basePath}/users/")
 @RequiredArgsConstructor
 public class UserController {
 
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/VocabularyController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/VocabularyController.java
index a0eb1c61d..99cac773e 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/VocabularyController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/VocabularyController.java
@@ -14,7 +14,7 @@
 import static io.fairspace.saturn.vocabulary.Vocabularies.VOCABULARY;
 
 @RestController
-@RequestMapping("/api/vocabulary/")
+@RequestMapping("${application.basePath}/vocabulary/")
 public class VocabularyController {
 
     @GetMapping
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/controller/WorkspaceController.java b/projects/saturn/src/main/java/io/fairspace/saturn/controller/WorkspaceController.java
index 285332668..6c2edfa90 100644
--- a/projects/saturn/src/main/java/io/fairspace/saturn/controller/WorkspaceController.java
+++ b/projects/saturn/src/main/java/io/fairspace/saturn/controller/WorkspaceController.java
@@ -38,8 +38,7 @@ public WorkspaceController(Services services) {
     @PutMapping(value = "/")
     public ResponseEntity<Workspace> createWorkspace(@RequestBody Workspace workspace) {
         var createdWorkspace = services.getWorkspaceService().createWorkspace(workspace);
-        return ResponseEntity.ok(
-                createdWorkspace); // it should return HTTP 201 CREATED - tobe analyzed across the codebase
+        return ResponseEntity.ok(createdWorkspace);
     }
 
     @GetMapping(value = "/", produces = MediaType.APPLICATION_JSON_VALUE)