diff --git a/app/src/main/java/com/ozonehis/eip/Application.java b/app/src/main/java/com/ozonehis/eip/Application.java
index d1639d9..14d10f4 100644
--- a/app/src/main/java/com/ozonehis/eip/Application.java
+++ b/app/src/main/java/com/ozonehis/eip/Application.java
@@ -12,7 +12,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @Slf4j
-@SpringBootApplication(scanBasePackages = {"org.openmrs.eip, com.ozonehis.eip"})
+@SpringBootApplication(scanBasePackages = "com.ozonehis.eip.*, ${eip.app.scan.packages}")
 public class Application {
 
     public static void main(final String[] args) {
diff --git a/app/src/main/resources/eip-client.properties b/app/src/main/resources/eip-client.properties
index 3c7684e..6c83303 100644
--- a/app/src/main/resources/eip-client.properties
+++ b/app/src/main/resources/eip-client.properties
@@ -22,3 +22,9 @@ camel.springboot.main-run-controller=true
 # Camel context name
 camel.springboot.name=${spring.application.name}
 # ----------------------------------------------------------------------------------------------------------------------
+
+## --- EIP Client Configuration ----------------------------------------------------------------------------------------
+# Comma-separated list of packages to scan for EIP classes (components, routes, etc.)
+# Default is org.openmrs.eip.*, which scans all packages under org.openmrs.eip. You can specify other different packages.
+eip.app.scan.packages=org.openmrs.eip.*
+# ----------------------------------------------------------------------------------------------------------------------