diff --git a/chat-api/pom.xml b/chat-api/pom.xml
index 744b808..5677386 100644
--- a/chat-api/pom.xml
+++ b/chat-api/pom.xml
@@ -95,6 +95,14 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Code generator -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Monitoring & Metrics -->
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -131,6 +139,11 @@
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.30</version>
+                        </path>
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>