diff --git a/pom.xml b/pom.xml
index 0b85d6d..27cb4b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,14 +35,19 @@
             <version>0.6-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>1.4.6.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-         <dependency>
-	    <groupId>org.springframework.boot</groupId>
-	    <artifactId>spring-boot-starter-tomcat</artifactId>
-	    <scope>provided</scope>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
 	    </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5f63f6b..f624eac 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -18,7 +18,7 @@
 #####################################################################################
 # SPRING-CORE
 #####################################################################################
-spring.application.name=EGA accession service
+spring.application.name=ega-accession-service
 # Bean jmx domain when using multiple applications with tomcat.
 spring.jmx.default-domain=ega-accession
 endpoints.jmx.domain=ega-accession
@@ -96,3 +96,13 @@ accessioning.monotonic.array.nextBlockInterval=0
 accessioning.monotonic.sample.blockSize=1000
 accessioning.monotonic.sample.blockStartValue=0
 accessioning.monotonic.sample.nextBlockInterval=0
+
+#####################################################################################
+# Local Eureka
+#####################################################################################
+eureka.name=accessionService
+eureka.port=8761
+eureka.vipAddress=
+eureka.serviceUrls=
+eureka.client.serviceUrl.defaultZone=
+eureka.instance.preferIpAddress=true
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 9b9f8e5..0ebe1c7 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -67,4 +67,7 @@ accessioning.monotonic.array.nextBlockInterval=0
 
 accessioning.monotonic.sample.blockSize=1000
 accessioning.monotonic.sample.blockStartValue=0
-accessioning.monotonic.sample.nextBlockInterval=0
\ No newline at end of file
+accessioning.monotonic.sample.nextBlockInterval=0
+
+# disable eureka for test
+eureka.client.enabled=false