diff --git a/README.md b/README.md
index 26b34f1..467c0eb 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,9 @@ Run services `api-gateway`, `order-service`, `customer-service`, `inventory-serv
 | Customer service  | localhost:9091 |
 | Inventory service | localhost:9093 |
 
+
+> Note: service discovery now defaults to `localhost` for local development. If you run services in Docker and need a different address, set `SERVICE_HOSTNAME` before starting each service (for example `export SERVICE_HOSTNAME=host.docker.internal`).
+
 ### Start outbox connectors
 
 Create outbox connectors
diff --git a/customer-service/src/main/resources/application.yml b/customer-service/src/main/resources/application.yml
index 7635e64..fae0a1e 100644
--- a/customer-service/src/main/resources/application.yml
+++ b/customer-service/src/main/resources/application.yml
@@ -21,6 +21,9 @@ spring:
     consul:
       host: ${CONSUL_HOST:localhost}
       port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: false
+        hostname: ${SERVICE_HOSTNAME:host.docker.internal}
     function:
       definition: handleReserveCustomerBalanceRequest;handleCompensateCustomerBalanceRequest
     stream:
diff --git a/inventory-service/src/main/resources/application.yml b/inventory-service/src/main/resources/application.yml
index 6397041..15773b9 100644
--- a/inventory-service/src/main/resources/application.yml
+++ b/inventory-service/src/main/resources/application.yml
@@ -21,6 +21,9 @@ spring:
     consul:
       host: ${CONSUL_HOST:localhost}
       port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: false
+        hostname: ${SERVICE_HOSTNAME:host.docker.internal}
     function:
       definition: handleReserveProductStockRequest
     stream:
diff --git a/order-service/src/main/resources/application.yml b/order-service/src/main/resources/application.yml
index fe8939e..f7954ff 100644
--- a/order-service/src/main/resources/application.yml
+++ b/order-service/src/main/resources/application.yml
@@ -21,6 +21,9 @@ spring:
     consul:
       host: ${CONSUL_HOST:localhost}
       port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: false
+        hostname: ${SERVICE_HOSTNAME:host.docker.internal}
     function:
       definition: reserveCustomerBalanceStage;reserveProductStockStage
     stream:
diff --git a/pom.xml b/pom.xml
index bb34c1d..ef032b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
 
   <properties>
     <java.version>21</java.version>
+    <lombok.version>1.18.44</lombok.version>
     <spring-cloud.version>2025.0.0</spring-cloud.version>
   </properties>
 
@@ -41,6 +42,21 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <!-- Source: https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+<dependency>
+    <groupId>org.projectlombok</groupId>
+    <artifactId>lombok</artifactId>
+    <version>1.18.44</version>
+    <scope>compile</scope>
+</dependency>
+<!-- Source: https://mvnrepository.com/artifact/org.projectlombok/lombok-maven -->
+<dependency>
+    <groupId>org.projectlombok</groupId>
+    <artifactId>lombok-maven</artifactId>
+    <version>1.18.20.0</version>
+    <type>pom</type>
+    <scope>compile</scope>
+</dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-stream</artifactId>
@@ -59,11 +75,12 @@
       <artifactId>spring-boot-configuration-processor</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
+    <!-- <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <version>${lombok.version}</version>
       <optional>true</optional>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
@@ -82,4 +99,25 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <build>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <version>3.11.0</version>
+      <configuration>
+        <source>${java.version}</source>
+        <target>${java.version}</target>
+        <annotationProcessorPaths>
+          <path>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+          </path>
+        </annotationProcessorPaths>
+      </configuration>
+    </plugin>
+  </plugins>
+</build>
 </project>
\ No newline at end of file