diff --git a/build.gradle b/build.gradle
index f4068f1..21ecadc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-mail'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.retry:spring-retry'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
     implementation 'org.springframework:spring-aspects'
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
     implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
@@ -63,6 +64,13 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
+dependencyManagement {
+    imports {
+        // This coordinates and provides the correct version for the Eureka client automatically
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1"
+    }
+}
+
 // Unified test configuration block
 tasks.named('test') {
     useJUnitPlatform()
diff --git a/src/main/resources/application-config.yaml b/src/main/resources/application-config.yaml
index 0e9ff74..efe3258 100644
--- a/src/main/resources/application-config.yaml
+++ b/src/main/resources/application-config.yaml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: identity-and-access-management-service
+    name: iam-service
 
   data:
     mongodb:
@@ -63,7 +63,7 @@ mdc:
   key: traceId
 
 server:
-  port: 5600
+  port: 4200
 
 logging:
   level:
@@ -85,4 +85,9 @@ management:
 
   endpoint:
     health:
-      show-details: always
\ No newline at end of file
+      show-details: always
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
\ No newline at end of file