diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 913e29d..f528ae0 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,4 +1,4 @@
-name: Java CI with Maven (User Service)
+name: Java CI with Maven
 
 on:
   push:
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..919ce1f
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ca08c49..e1d5c98 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,14 +17,11 @@
         <module name="gateway" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="client-server" target="17" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="17" />
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="bag-service" options="-parameters" />
-      <module name="client-server" options="-parameters" />
       <module name="config-client-service" options="-parameters" />
       <module name="config-server" options="-parameters" />
       <module name="eureka-server" options="-parameters" />
diff --git a/bag-service/src/main/resources/application-local.yml b/bag-service/src/main/resources/application-local.yml
new file mode 100644
index 0000000..bf44303
--- /dev/null
+++ b/bag-service/src/main/resources/application-local.yml
@@ -0,0 +1,40 @@
+server:
+  port: 8084
+
+spring:
+  application:
+    name: bag-service
+  config:
+    activate:
+      on-profile: local
+    import: "optional:configserver:"
+#    config:
+#      enabled: true
+  cloud:
+    bus:
+      enabled: false
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/bag-service/src/main/resources/application.yml b/bag-service/src/main/resources/application.yml
index 050543d..a755988 100644
--- a/bag-service/src/main/resources/application.yml
+++ b/bag-service/src/main/resources/application.yml
@@ -2,19 +2,24 @@ server:
   port: 8084
 
 spring:
-  config:
-    import: configserver:http://localhost:8085
-#eureka:
-#  client:
-#    register-with-eureka: true
-#    fetch-registry: true
-#    serviceUrl:
-#      defaultZone: http://localhost:8761/eureka  #eureka endpoint
-#
-#    healthcheck:
-#      enabled: true
-#
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-#    hostname: localhost
\ No newline at end of file
+  profiles:
+    active: local
+  application:
+      name: bag-service
+#  config:
+#    import: configserver:http://localhost:8085
+
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka  #eureka endpoint
+
+    healthcheck:
+      enabled: true
+
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/config-client-service/src/main/java/com/lokesh/poc/configclient/configclientservice/ConfigClientServiceApplication.java b/config-client-service/src/main/java/com/lokesh/poc/configclient/configclientservice/ConfigClientServiceApplication.java
index ff1513d..6dca8c3 100644
--- a/config-client-service/src/main/java/com/lokesh/poc/configclient/configclientservice/ConfigClientServiceApplication.java
+++ b/config-client-service/src/main/java/com/lokesh/poc/configclient/configclientservice/ConfigClientServiceApplication.java
@@ -6,6 +6,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.event.EventListener;
@@ -13,6 +14,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 public class ConfigClientServiceApplication {
@@ -27,7 +29,7 @@ ApplicationRunner runner() {
 	}
 }
 
-@Controller
+@RestController
 @ResponseBody
 @RequiredArgsConstructor
 //@RefreshScope
diff --git a/config-server/src/main/java/com/lokesh/poc/configserver/ConfigServerApplication.java b/config-server/src/main/java/com/lokesh/poc/configserver/ConfigServerApplication.java
index cb4f1f1..4b8afc1 100644
--- a/config-server/src/main/java/com/lokesh/poc/configserver/ConfigServerApplication.java
+++ b/config-server/src/main/java/com/lokesh/poc/configserver/ConfigServerApplication.java
@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.config.server.EnableConfigServer;
 
 @SpringBootApplication
 @EnableConfigServer
+@EnableDiscoveryClient
 public class ConfigServerApplication {
 
 	public static void main(String[] args) {
diff --git a/config-server/src/main/resources/application-local.yml b/config-server/src/main/resources/application-local.yml
new file mode 100644
index 0000000..82d45c3
--- /dev/null
+++ b/config-server/src/main/resources/application-local.yml
@@ -0,0 +1,58 @@
+server:
+  port: 8085
+
+spring:
+  application:
+    name: config-service
+  config:
+    activate:
+      on-profile: local
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/Lokesh598/order-management-spring-cloud-config
+          default-label: main
+          clone-on-start: true
+    monitor:
+      enabled: true
+    bus:
+      enabled: false
+    stream:
+      kafka:
+        binder:
+          brokers: localhost:9092
+        bindings:
+          output:
+            destination: config-server
+
+  management:
+    endpoints:
+      web:
+        exposure:
+          include: "*"
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/config-server/src/main/resources/application.yml b/config-server/src/main/resources/application.yml
index 193b7a9..9fe6008 100644
--- a/config-server/src/main/resources/application.yml
+++ b/config-server/src/main/resources/application.yml
@@ -2,6 +2,8 @@ server:
   port: 8085
 
 spring:
+  profiles:
+    active: local
   application:
     name: config-server
 
@@ -16,16 +18,16 @@ spring:
       enabled: true
     bus:
       enabled: true
-#    stream:
-#      kafka:
-#        binder:
-#          brokers: localhost:9092
-#        bindings:
-#          output:
-#            destination: config-server
+    stream:
+      kafka:
+        binder:
+          brokers: localhost:9092
+        bindings:
+          output:
+            destination: config-server
 
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: "*"
\ No newline at end of file
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
\ No newline at end of file
diff --git a/eureka-server/src/main/resources/application-local.yml b/eureka-server/src/main/resources/application-local.yml
new file mode 100644
index 0000000..7e8cfa0
--- /dev/null
+++ b/eureka-server/src/main/resources/application-local.yml
@@ -0,0 +1,40 @@
+#server:
+#  port: 8082
+
+#spring:
+#  application:
+#    name: eureka-service
+#  config:
+#    activate:
+#      on-profile: local
+#    import: "optional:configserver:"
+##    config:
+##      enabled: true
+#  cloud:
+#    bus:
+#      enabled: false
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+#eureka:
+#  client:
+#    register-with-eureka: true
+#    fetch-registry: true
+#    serviceUrl:
+#      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+#    healthcheck:
+#      enabled: true
+#  instance:
+#    leaseRenewalIntervalInSeconds: 1
+#    leaseExpirationDurationInSeconds: 2
+#    hostname: localhost
\ No newline at end of file
diff --git a/eureka-server/src/main/resources/application.yml b/eureka-server/src/main/resources/application.yml
index d663446..df3e052 100644
--- a/eureka-server/src/main/resources/application.yml
+++ b/eureka-server/src/main/resources/application.yml
@@ -3,13 +3,16 @@ eureka:
     register-with-eureka: false
     fetch-registry: false
 
-#
-#server:
-#  port: 8761
 
 server:
-  port: 8767
+  port: 8761
+
+
+#server:
+#  port: 8767
 
 spring:
+  profiles:
+    active: local
   application:
     name: registry
\ No newline at end of file
diff --git a/gateway/src/main/resources/application-local.yml b/gateway/src/main/resources/application-local.yml
new file mode 100644
index 0000000..3484da8
--- /dev/null
+++ b/gateway/src/main/resources/application-local.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8172
+
+spring:
+  application:
+    name: gateway-service
+  config:
+    activate:
+      on-profile: local
+    import: "optional:configserver:"
+    config:
+      enabled: true
+      import: configserver:http://localhost:8085
+      cloud:
+        gateway:
+          routes:
+            - id: product-service
+              uri: lb://product-service
+              predicates:
+                - Path=/product-service/**
+              filters:
+                - StripPrefix=1
+            - id: user-service
+              uri: lb://user-service
+              predicates:
+                - Path=/user-service/**
+              filters:
+                - StripPrefix=1
+            - id: bag-service
+              uri: lb://bag-service
+              predicates:
+                - Path=/bag-service/**
+              filters:
+                - StripPrefix=1
+            - id: order-service
+              uri: lb://order-service
+              predicates:
+                - Path=/order-service/**
+              filters:
+                - StripPrefix=1
+            - id: registry
+              uri: lb://registry
+              predicates:
+                - Path=/registry/**
+              filters:
+                - StripPrefix=1
+            - id: eureka
+              uri: lb://registry
+              predicates:
+                - Path=/eureka/**
+
+    info:
+      app:
+        name: ${spring.application.name}
+  cloud:
+    bus:
+      enabled: false
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index fb47f88..17346f8 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -2,6 +2,8 @@ server:
   port: 8172
 
 spring:
+  profiles:
+    active: local
   application:
     name: api-gateway
   config:
@@ -56,19 +58,19 @@ info:
 #    healthcheck:
 #      enabled: true
 
-#eureka:
-#  client:
-#    register-with-eureka: true
-#    fetch-registry: true
-#    serviceUrl:
-#      defaultZone: http://localhost:8761/eureka
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka
 
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include:
-#          - mappings
-#          - env
-#          - health
-#          - info
\ No newline at end of file
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - mappings
+          - env
+          - health
+          - info
\ No newline at end of file
diff --git a/order-service/src/main/resources/application-local.yml b/order-service/src/main/resources/application-local.yml
new file mode 100644
index 0000000..a90b146
--- /dev/null
+++ b/order-service/src/main/resources/application-local.yml
@@ -0,0 +1,40 @@
+server:
+  port: 8083
+
+spring:
+  application:
+    name: order-service
+  config:
+    activate:
+      on-profile: local
+    import: "optional:configserver:"
+#    config:
+#      enabled: true
+  cloud:
+    bus:
+      enabled: false
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/order-service/src/main/resources/application.yml b/order-service/src/main/resources/application.yml
index 865a469..574b639 100644
--- a/order-service/src/main/resources/application.yml
+++ b/order-service/src/main/resources/application.yml
@@ -2,19 +2,23 @@ server:
   port: 8083
 
 spring:
-  config:
-    import: configserver:http://localhost:8085
-#eureka:
-#  client:
-#    register-with-eureka: true
-#    fetch-registry: true
-#    serviceUrl:
-#      defaultZone: http://localhost:8761/eureka  #eureka endpoint
-#
-#    healthcheck:
-#      enabled: true
-#
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-#    hostname: localhost
\ No newline at end of file
+  profiles:
+    active: local
+  application:
+    name: order-service
+#  config:
+#    import: configserver:http://localhost:8085
+
+
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..12b1928
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- Parent Project Information -->
+    <groupId>com.example</groupId>
+    <artifactId>my-multi-module-project</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name>Order-management</name>
+    <description>A multi-module project example</description>
+
+    <!-- Modules (Subprojects) -->
+<!--    <modules>-->
+<!--        <module>module1</module>-->
+<!--        <module>module2</module>-->
+<!--    </modules>-->
+
+    <!-- Centralized Dependencies -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter</artifactId>
+                <version>3.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-actuator</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <optional>true</optional>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <!-- Plugins or Build Configurations -->
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.10.1</version>
+                    <configuration>
+                        <source>17</source>
+                        <target>17</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/product-service/src/main/resources/application-local.yml b/product-service/src/main/resources/application-local.yml
new file mode 100644
index 0000000..04045ba
--- /dev/null
+++ b/product-service/src/main/resources/application-local.yml
@@ -0,0 +1,40 @@
+server:
+  port: 8081
+
+spring:
+  application:
+    name: product-service
+  config:
+    activate:
+      on-profile: local
+    import: "optional:configserver:"
+#    config:
+#      enabled: true
+  cloud:
+    bus:
+      enabled: false
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/product-service/src/main/resources/application.yml b/product-service/src/main/resources/application.yml
index b39e1be..599a668 100644
--- a/product-service/src/main/resources/application.yml
+++ b/product-service/src/main/resources/application.yml
@@ -3,8 +3,12 @@ server:
 #server:
 #  port: 0 # to run multiple instances on random ports
 spring:
-  config:
-    import: configserver:http://localhost:8085
+  profiles:
+    active: local
+    application:
+        name: product-service
+#  config:
+#    import: configserver:http://localhost:8085
 #
 #    # Configure the message broker connection (RabbitMQ or Kafka)
 #  cloud:
diff --git a/user-service/pom.xml b/user-service/pom.xml
index 68b0f88..c8dd73d 100644
--- a/user-service/pom.xml
+++ b/user-service/pom.xml
@@ -40,7 +40,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bus-amqp</artifactId>
+			<artifactId>spring-cloud-starter-bus-kafka</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/user-service/src/main/java/com/lokesh/poc/user/UserServiceApplication.java b/user-service/src/main/java/com/lokesh/poc/user/UserServiceApplication.java
index 1240549..2bc2d28 100644
--- a/user-service/src/main/java/com/lokesh/poc/user/UserServiceApplication.java
+++ b/user-service/src/main/java/com/lokesh/poc/user/UserServiceApplication.java
@@ -2,9 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 
 @SpringBootApplication
+//@EnableDiscoveryClient
 public class UserServiceApplication {
 
 	public static void main(String[] args) {
diff --git a/user-service/src/main/resources/application-dev.yml b/user-service/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..14dddc8
--- /dev/null
+++ b/user-service/src/main/resources/application-dev.yml
@@ -0,0 +1,44 @@
+server:
+  port: 8082
+
+spring:
+  application:
+    name: user-service
+  config:
+    activate:
+      on-profile: dev
+    import: configserver:http://localhost:8085
+#    config:
+#      enabled: true
+  cloud:
+    bus:
+      enabled: false
+    rabbitmq:
+      enabled: false
+
+
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+#eureka:
+#  client:
+#    register-with-eureka: true
+#    fetch-registry: true
+#    serviceUrl:
+#      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+#    healthcheck:
+#      enabled: true
+#  instance:
+#    leaseRenewalIntervalInSeconds: 1
+#    leaseExpirationDurationInSeconds: 2
+#    hostname: localhost
\ No newline at end of file
diff --git a/user-service/src/main/resources/application-local.yml b/user-service/src/main/resources/application-local.yml
new file mode 100644
index 0000000..8c57f83
--- /dev/null
+++ b/user-service/src/main/resources/application-local.yml
@@ -0,0 +1,53 @@
+server:
+  port: 8082
+
+spring:
+  application:
+    name: user-service
+  config:
+    activate:
+      on-profile: local
+    import: "optional:configserver:"
+#    config:
+#      enabled: true
+  cloud:
+    bus:
+      enabled: true # Enable Cloud Bus
+    stream:
+      kafka:
+        binder:
+          brokers: localhost:9092 # Kafka broker address
+          default-binder: true
+        bindings:
+          output:
+            destination: config-bus-topic # Kafka topic used for bus events
+
+
+
+
+    # Configure the message broker connection (RabbitMQ or Kafka)
+
+
+#  cloud:
+#    config:
+#      uri: http://${CONFIG_SERVER_SERVICE_SERVICE_HOST:localhost}:8085
+#    bus:
+#      enabled: true
+#      refresh:
+#        enabled: true
+#      trace:
+#        enabled: true
+#  rabbitmq:
+#    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file
diff --git a/user-service/src/main/resources/application.yml b/user-service/src/main/resources/application.yml
index ba9e8ed..d745bd8 100644
--- a/user-service/src/main/resources/application.yml
+++ b/user-service/src/main/resources/application.yml
@@ -2,8 +2,14 @@ server:
   port: 8082
 
 spring:
-  config:
-    import: configserver:http://localhost:8085
+  profiles:
+    active: local
+  application:
+    name: user-service
+#  config:
+#    import: configserver:http://localhost:8085
+#    config:
+#      enabled: true
 
     # Configure the message broker connection (RabbitMQ or Kafka)
 #  cloud:
@@ -17,17 +23,15 @@ spring:
 #        enabled: true
 #  rabbitmq:
 #    addresses: ${RABBITMQ_SERVICE_SERVICE_HOST:localhost}
-#eureka:
-#  client:
-#    register-with-eureka: true
-#    fetch-registry: true
-#    serviceUrl:
-#      defaultZone: http://localhost:8761/eureka  #eureka endpoint
-#
-#    healthcheck:
-#      enabled: true
-#
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-#    hostname: localhost
\ No newline at end of file
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}  #eureka endpoint
+    healthcheck:
+      enabled: true
+  instance:
+    leaseRenewalIntervalInSeconds: 1
+    leaseExpirationDurationInSeconds: 2
+    hostname: localhost
\ No newline at end of file