diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/application-config/discovery.properties
similarity index 88%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-rest/application-config/discovery.properties
index 3fd35c1f19..7775cac83a 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/application.properties
+++ b/spring-cloud/spring-cloud-rest/application-config/discovery.properties
@@ -1,5 +1,7 @@
-#### cloud
+spring.application.name=discovery
 server.port=8761
+
+#### cloud
 eureka.client.registerWithEureka=false
 eureka.client.fetchRegistry=false
 
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/application-config/resource.properties
similarity index 91%
rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-rest/application-config/resource.properties
index 65fcb7b71e..8add49ab7e 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/application.properties
+++ b/spring-cloud/spring-cloud-rest/application-config/resource.properties
@@ -1,6 +1,7 @@
-#### cloud
-spring.application.name=spring-cloud-eureka-client
+spring.application.name=resource
 server.port=0
+
+#### cloud
 eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka}
 eureka.instance.preferIpAddress=true
 
diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud/spring-cloud-rest/pom.xml
index 3424d988a9..376ce96b95 100644
--- a/spring-cloud/spring-cloud-rest/pom.xml
+++ b/spring-cloud/spring-cloud-rest/pom.xml
@@ -7,6 +7,7 @@
     <artifactId>spring-cloud-rest</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <modules>
+        <module>spring-cloud-rest-config</module>
         <module>spring-cloud-rest-server</module>
         <module>spring-cloud-rest-client-1</module>
         <module>spring-cloud-rest-client-2</module>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml
index f50ae7e8f2..ac878d1652 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml
@@ -8,8 +8,8 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-rest</name>
-	<description>Demo project for Spring Boot</description>
+	<name>spring-cloud-rest-client-1</name>
+	<description>Client Service for books</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -26,6 +26,10 @@
 	</properties>
 
 	<dependencies>
+	   <dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000000..f34f1b65ac
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties
@@ -0,0 +1,3 @@
+spring.cloud.config.name=resource
+spring.cloud.config.discovery.service-id=config
+spring.cloud.config.discovery.enabled=true
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml
index 359045829b..6645e1382c 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml
@@ -8,8 +8,8 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-rest</name>
-	<description>Demo project for Spring Boot</description>
+	<name>spring-cloud-rest-client-2</name>
+	<description>Client Service for book reviews</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -26,6 +26,10 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/application.properties
index 65fcb7b71e..f443e86fd8 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/application.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 #### cloud
 spring.application.name=spring-cloud-eureka-client
 server.port=0
-eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka}
+eureka.client.serviceUrl.defaultZone=http://system:systemPass@localhost:8761/eureka
 eureka.instance.preferIpAddress=true
 
 #### persistence
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore
new file mode 100644
index 0000000000..2af7cefb0a
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore
@@ -0,0 +1,24 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
new file mode 100644
index 0000000000..20b5eaf908
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+	<groupId>org.baeldung</groupId>
+	<artifactId>spring-cloud-rest-config</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>spring-cloud-rest-config</name>
+	<description>Spring Cloud REST configuration server</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.4.3.RELEASE</version>
+		<relativePath/> 
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Camden.SR4</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-config-server</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+        
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/*IntegrationTest.java</exclude>
+						<exclude>**/*LiveTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
new file mode 100644
index 0000000000..90c6fe3ec9
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@SpringBootApplication
+@EnableConfigServer
+@EnableEurekaClient
+public class SpringCloudRestConfigApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringCloudRestConfigApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000000..f34f1b65ac
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties
@@ -0,0 +1,3 @@
+spring.cloud.config.name=resource
+spring.cloud.config.discovery.service-id=config
+spring.cloud.config.discovery.enabled=true
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigApplicationTests.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigApplicationTests.java
new file mode 100644
index 0000000000..072a3e6ffc
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigApplicationTests.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringCloudRestConfigApplicationTests {
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.mvn/wrapper/maven-wrapper.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index c954cec91c..0000000000
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml
index be67799fee..98325e8ae9 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml
@@ -26,6 +26,10 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 		    <groupId>org.springframework.cloud</groupId>
 		    <artifactId>spring-cloud-starter-eureka-server</artifactId>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000000..ca9d59c9ed
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
@@ -0,0 +1,2 @@
+spring.cloud.config.name=discovery
+spring.cloud.config.uri=http://localhost:8081
\ No newline at end of file