diff --git a/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java b/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java
index 659bec5..62456e6 100644
--- a/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java
+++ b/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java
@@ -3,12 +3,14 @@ package com.drinkool.dtos;
 import com.drinkool.entities.MenuItemEntity;
 import com.drinkool.entities.ReviewEntity;
 import com.drinkool.lib.dtos.SendReview;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 
-@Mapper(componentModel = "cdi")
+@ApplicationScoped
+@Mapper(componentModel = "jakarta")
 public interface DtoMapper {
 	@BeanMapping(
 		nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE