diff --git a/apps/api/src/main/kotlin/com/github/thorlauridsen/controller/CustomerController.kt b/apps/api/src/main/kotlin/com/github/thorlauridsen/controller/CustomerController.kt
index 9949dad..aa5b0b0 100644
--- a/apps/api/src/main/kotlin/com/github/thorlauridsen/controller/CustomerController.kt
+++ b/apps/api/src/main/kotlin/com/github/thorlauridsen/controller/CustomerController.kt
@@ -4,10 +4,10 @@ import com.github.thorlauridsen.dto.CustomerDto
 import com.github.thorlauridsen.dto.CustomerInputDto
 import com.github.thorlauridsen.dto.toDto
 import com.github.thorlauridsen.service.CustomerService
-import org.springframework.http.ResponseEntity
-import org.springframework.stereotype.Controller
 import java.net.URI
 import java.util.UUID
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.RestController
 
 /**
  * This REST controller consists of endpoints for:
@@ -20,7 +20,7 @@ import java.util.UUID
  *
  * @param customerService [CustomerService] service layer.
  */
-@Controller
+@RestController
 class CustomerController(private val customerService: CustomerService) : ICustomerController {
 
     /**
diff --git a/apps/api/src/main/kotlin/com/github/thorlauridsen/exception/ControllerAdvisor.kt b/apps/api/src/main/kotlin/com/github/thorlauridsen/exception/ControllerAdvisor.kt
index 561e546..dd01586 100644
--- a/apps/api/src/main/kotlin/com/github/thorlauridsen/exception/ControllerAdvisor.kt
+++ b/apps/api/src/main/kotlin/com/github/thorlauridsen/exception/ControllerAdvisor.kt
@@ -4,15 +4,15 @@ import com.github.thorlauridsen.dto.ErrorDto
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
+import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.reactive.result.method.annotation.ResponseEntityExceptionHandler
 
 /**
  * Controller advisor for handling exceptions.
  * This ensures that whenever an exception is thrown, a proper error response is returned to the client.
  */
-@ControllerAdvice
+@RestControllerAdvice
 class ControllerAdvisor : ResponseEntityExceptionHandler() {
 
     private val logger = LoggerFactory.getLogger(ControllerAdvisor::class.java)