diff --git a/cloudbank-v5/customer-helidon/pom.xml b/cloudbank-v5/customer-helidon/pom.xml
index 645702ed9..1329ec1e2 100644
--- a/cloudbank-v5/customer-helidon/pom.xml
+++ b/cloudbank-v5/customer-helidon/pom.xml
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>io.helidon.integrations.eureka</groupId>
             <artifactId>helidon-integrations-eureka</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.integrations.cdi</groupId>
diff --git a/cloudbank-v5/customer-helidon/src/main/resources/META-INF/microprofile-config.properties b/cloudbank-v5/customer-helidon/src/main/resources/META-INF/microprofile-config.properties
index 935262b65..8806a7eec 100644
--- a/cloudbank-v5/customer-helidon/src/main/resources/META-INF/microprofile-config.properties
+++ b/cloudbank-v5/customer-helidon/src/main/resources/META-INF/microprofile-config.properties
@@ -21,11 +21,6 @@ hibernate.hbm2ddl.auto=create
 hibernate.show_sql=true
 hibernate.transaction.coordinator_class=jta
 
-# Eureka configuration
-server.features.eureka.client.base-uri=http://eureka.eureka:8761/eureka
-server.features.eureka.instance.name=customer-helidon
-server.features.eureka.instance.hostName=customer.helidon
-
 # Liquibase configuration - Helidon style
 liquibase.change-log=classpath:db/changelog/controller.yaml
 liquibase.url=${javax.sql.DataSource.customer.URL}
diff --git a/cloudbank-v5/customer-helidon/src/main/resources/application.yaml b/cloudbank-v5/customer-helidon/src/main/resources/application.yaml
new file mode 100644
index 000000000..9a7fce1c9
--- /dev/null
+++ b/cloudbank-v5/customer-helidon/src/main/resources/application.yaml
@@ -0,0 +1,12 @@
+  server:
+    features:
+      eureka:
+        enabled: true
+        client:
+          base-uri: ${eureka.client.service-url.defaultZone}
+          connect-timeout: PT10S
+          read-timeout: PT30S
+        instance:
+          name: "customer-helidon"
+          hostname: ${eureka.instance.hostname}
+          prefer-ip-address: ${eureka.instance.preferIpAddress:true}
\ No newline at end of file