diff --git a/petclinic-containers/pom.xml b/petclinic-container/pom.xml
similarity index 62%
rename from petclinic-containers/pom.xml
rename to petclinic-container/pom.xml
index 4e16a4426..5f37a34d3 100644
--- a/petclinic-containers/pom.xml
+++ b/petclinic-container/pom.xml
@@ -10,12 +10,10 @@
         <version>2.0</version>
     </parent>
 
-    <artifactId>petclinic-containers</artifactId>
+    <artifactId>petclinic-container</artifactId>
     <packaging>pom</packaging>
 
     <name>petclinic-containers</name>
-
-
     <profiles>
         <profile>
             <id>docker-build</id>
@@ -43,15 +41,36 @@
                                             <groupId>org.springframework.samples</groupId>
                                             <artifactId>petclinic-application</artifactId>
                                             <version>${project.version}</version>
-                                            <type>${project.packaging}</type>
+                                            <type>jar</type>
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                                             <destFileName>petclinic.jar</destFileName>
                                         </artifactItem>
                                     </artifactItems>
-                                    <outputDirectory>${docker.build.directory}</outputDirectory>
-                                    <overWriteReleases>true</overWriteReleases>
-                                    <overWriteSnapshots>true</overWriteSnapshots>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>${mojo-exec.version}</version>
+                        <executions>
+                            <execution>
+                                <id>docker-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <workingDirectory>${project.basedir}/src/main/resources</workingDirectory>
+                                    <arguments>
+                                        <argument>build</argument>
+                                        <argument>.</argument>
+                                        <argument>-t</argument>
+                                        <argument>${project.groupId}/${project.artifactId}:${project.version}</argument>
+                                    </arguments>
                                 </configuration>
                             </execution>
                         </executions>
@@ -60,5 +79,4 @@
             </build>
         </profile>
     </profiles>
-
 </project>
diff --git a/petclinic-container/src/main/resources/dockerfile b/petclinic-container/src/main/resources/dockerfile
new file mode 100644
index 000000000..9c48f6cde
--- /dev/null
+++ b/petclinic-container/src/main/resources/dockerfile
@@ -0,0 +1,4 @@
+FROM java:8
+EXPOSE 8080
+COPY petclinic.jar /
+CMD ["java", "-jar", "petclinic.jar"]
diff --git a/petclinic-container/src/main/resources/petclinic.jar b/petclinic-container/src/main/resources/petclinic.jar
new file mode 100644
index 000000000..5b64db9c6
Binary files /dev/null and b/petclinic-container/src/main/resources/petclinic.jar differ
diff --git a/petclinic-containers/src/main/resources/Dockerfile b/petclinic-containers/src/main/resources/Dockerfile
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pom.xml b/pom.xml
index 98ab7072a..10823ae1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <modules>
         <module>petclinic-application</module>
-        <module>petclinic-containers</module>
+        <module>petclinic-container</module>
     </modules>
 
     <properties>
@@ -44,6 +44,7 @@
 
         <!-- Other properties -->
         <deploy-plugin.version>2.8.1</deploy-plugin.version>
+        <mojo-exec.version>1.6.0</mojo-exec.version>
     </properties>
 
     <repositories>
@@ -83,5 +84,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-
 </project>