diff --git a/spring-cloud-config/README.md b/spring-cloud-config/README.md
new file mode 100644
index 0000000000..b8ebb2bfe9
--- /dev/null
+++ b/spring-cloud-config/README.md
@@ -0,0 +1,27 @@
+## Spring Cloud Config ##
+
+To get this example working, you have to initialize a new *Git* repository in
+the ```client-config``` directory first *and* you have to set the environment variable
+```CONFIG_REPO``` to an absolute path of that directory.
+
+```
+$> cd client-config
+$> git init
+$> git add .
+$> git commit -m 'Initial commit'
+$> export CONFIG_REPO=$(pwd)
+```
+
+Then you're able to run the examples with ```mvn install spring-boot:run```.
+
+### Docker ###
+
+To get the *Docker* examples working, you have to repackage the ```spring-cloud-config-server```
+and ```spring-cloud-config-client``` modules first:
+
+```
+$> mvn install spring-boot:repackage
+```
+
+Don't forget to download the *Java JCE* package from
+(Oracle)[http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html].
diff --git a/spring-cloud-config/client/pom.xml b/spring-cloud-config/client/pom.xml
deleted file mode 100644
index 0ef4b35581..0000000000
--- a/spring-cloud-config/client/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-config</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>client</artifactId>
-    <packaging>jar</packaging>
-
-    <name>client</name>
-    <description>Demo project for Spring Cloud Config Client</description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</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>Brixton.BUILD-SNAPSHOT</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>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-</project>
diff --git a/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/ConfigClientLiveTest.java b/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/ConfigClientLiveTest.java
deleted file mode 100644
index 058fd45f35..0000000000
--- a/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/ConfigClientLiveTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.baeldung.spring.cloud.config.client;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConfigClient.class)
-@WebAppConfiguration
-public class ConfigClientLiveTest {
-    @Test
-    public void contextLoads() {
-    }
-}
diff --git a/spring-cloud-config/docker/Dockerfile.client b/spring-cloud-config/docker/Dockerfile.client
index 5fbc0b98c0..0f9293bd22 100644
--- a/spring-cloud-config/docker/Dockerfile.client
+++ b/spring-cloud-config/docker/Dockerfile.client
@@ -1,6 +1,6 @@
 FROM alpine-java:base
 MAINTAINER baeldung.com
 RUN apk --no-cache add netcat-openbsd
-COPY files/config-client.jar /opt/spring-cloud/lib/
+COPY files/spring-cloud-config-client-1.0.0-SNAPSHOT.jar /opt/spring-cloud/lib/config-client.jar
 COPY files/config-client-entrypoint.sh /opt/spring-cloud/bin/
 RUN chmod 755 /opt/spring-cloud/bin/config-client-entrypoint.sh
diff --git a/spring-cloud-config/docker/Dockerfile.server b/spring-cloud-config/docker/Dockerfile.server
index 4f7bd751e8..90d7e2a7cf 100644
--- a/spring-cloud-config/docker/Dockerfile.server
+++ b/spring-cloud-config/docker/Dockerfile.server
@@ -1,6 +1,6 @@
 FROM alpine-java:base
 MAINTAINER baeldung.com
-COPY files/config-server.jar /opt/spring-cloud/lib/
+COPY files/spring-cloud-config-server-1.0.0-SNAPSHOT.jar /opt/spring-cloud/lib/config-server.jar
 ENV SPRING_APPLICATION_JSON='{"spring": {"cloud": {"config": {"server": \
     {"git": {"uri": "/var/lib/spring-cloud/config-repo", "clone-on-start": true}}}}}}'
 ENTRYPOINT ["/usr/bin/java"]
diff --git a/spring-cloud-config/docker/files/.gitignore b/spring-cloud-config/docker/files/.gitignore
new file mode 100644
index 0000000000..28ffcbffdb
--- /dev/null
+++ b/spring-cloud-config/docker/files/.gitignore
@@ -0,0 +1,2 @@
+/UnlimitedJCEPolicyJDK8
+/*.jar
diff --git a/spring-cloud-config/docker/config-client-entrypoint.sh b/spring-cloud-config/docker/files/config-client-entrypoint.sh
similarity index 100%
rename from spring-cloud-config/docker/config-client-entrypoint.sh
rename to spring-cloud-config/docker/files/config-client-entrypoint.sh
diff --git a/spring-cloud-config/pom.xml b/spring-cloud-config/pom.xml
index 8e0e4b8706..3b1b59b037 100644
--- a/spring-cloud-config/pom.xml
+++ b/spring-cloud-config/pom.xml
@@ -5,38 +5,48 @@
 
     <groupId>com.baeldung.spring.cloud</groupId>
     <artifactId>spring-cloud-config</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
-        <module>server</module>
-        <module>client</module>
+        <module>spring-cloud-config-server</module>
+        <module>spring-cloud-config-client</module>
     </modules>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.5.RELEASE</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-parent</artifactId>
+                <version>1.4.0.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Brixton.SR4</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>1.4.0.RELEASE</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
-
-    <properties>
-        <org.springframework.boot.version>1.3.5.RELEASE</org.springframework.boot.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-    </properties>
 </project>
diff --git a/spring-cloud-config/server/pom.xml b/spring-cloud-config/server/pom.xml
deleted file mode 100644
index c3f68854bb..0000000000
--- a/spring-cloud-config/server/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-config</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>server</artifactId>
-
-    <name>server</name>
-    <description>Demo project for Spring Cloud Config Server</description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</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>Brixton.BUILD-SNAPSHOT</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>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-</project>
diff --git a/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java b/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java
deleted file mode 100644
index 306c120e43..0000000000
--- a/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.spring.cloud.config.server;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConfigServer.class)
-@WebAppConfiguration
-@Ignore
-public class ConfigServerListTest {
-    @Test
-    public void contextLoads() {
-    }
-}
diff --git a/spring-cloud-config/spring-cloud-config-client/pom.xml b/spring-cloud-config/spring-cloud-config-client/pom.xml
new file mode 100644
index 0000000000..968489bce2
--- /dev/null
+++ b/spring-cloud-config/spring-cloud-config-client/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-config</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-cloud-config-client</artifactId>
+    <packaging>jar</packaging>
+
+    <name>spring-cloud-config-client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+            <version>1.1.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.4.0.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>../docker/files</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java b/spring-cloud-config/spring-cloud-config-client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java
similarity index 100%
rename from spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java
rename to spring-cloud-config/spring-cloud-config-client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java
diff --git a/spring-cloud-config/client/src/main/resources/bootstrap.properties b/spring-cloud-config/spring-cloud-config-client/src/main/resources/bootstrap.properties
similarity index 72%
rename from spring-cloud-config/client/src/main/resources/bootstrap.properties
rename to spring-cloud-config/spring-cloud-config-client/src/main/resources/bootstrap.properties
index 18982a93b5..6c350bffcd 100644
--- a/spring-cloud-config/client/src/main/resources/bootstrap.properties
+++ b/spring-cloud-config/spring-cloud-config-client/src/main/resources/bootstrap.properties
@@ -1,5 +1,5 @@
 spring.application.name=config-client
 spring.profiles.active=development
-spring.cloud.config.uri=http://localhost:8888
+spring.cloud.config.uri=http://localhost:${PORT:8888}
 spring.cloud.config.username=root
 spring.cloud.config.password=s3cr3t
diff --git a/spring-cloud-config/spring-cloud-config-server/pom.xml b/spring-cloud-config/spring-cloud-config-server/pom.xml
new file mode 100644
index 0000000000..f2b8b69a6a
--- /dev/null
+++ b/spring-cloud-config/spring-cloud-config-server/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-config</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-cloud-config-server</artifactId>
+
+    <name>spring-cloud-config-server</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+            <version>1.1.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+            <version>1.4.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.4.0.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>../docker/files</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java b/spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java
similarity index 100%
rename from spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java
rename to spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java
diff --git a/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud-config/spring-cloud-config-server/src/main/resources/application.properties
similarity index 68%
rename from spring-cloud-config/server/src/main/resources/application.properties
rename to spring-cloud-config/spring-cloud-config-server/src/main/resources/application.properties
index 2131f3b249..c4f57f0a82 100644
--- a/spring-cloud-config/server/src/main/resources/application.properties
+++ b/spring-cloud-config/spring-cloud-config-server/src/main/resources/application.properties
@@ -1,6 +1,7 @@
-server.port=8888
-spring.cloud.config.server.git.uri=https://github.com/eugenp/tutorials/tree/master/spring-cloud-config/client-config
+server.port=${PORT:8888}
+spring.cloud.config.server.git.uri=${CONFIG_REPO}
 spring.cloud.config.server.git.clone-on-start=false
+spring.cloud.config.fail-fast=true
 security.user.name=root
 security.user.password=s3cr3t
 encrypt.key-store.location=classpath:/config-server.jks
diff --git a/spring-cloud-config/server/src/main/resources/config-server.jks b/spring-cloud-config/spring-cloud-config-server/src/main/resources/config-server.jks
similarity index 100%
rename from spring-cloud-config/server/src/main/resources/config-server.jks
rename to spring-cloud-config/spring-cloud-config-server/src/main/resources/config-server.jks