diff --git a/README.MD b/README.MD
index 55cccd8dc..f992a45d8 100644
--- a/README.MD
+++ b/README.MD
@@ -175,3 +175,23 @@ show an extra set of links below the cookie overview.
 
 To be able to see which labels are loaded through a property file, open up the developer tools avalailable from the info menu
 After the reload is complete, all labels which are loaded from a property file will be __marked green__.
+
+
+## Docker support
+
+WebGoat now has Docker support you can build a container with the following commands:
+
+```Shell
+cd WebGoat
+mvn -pl webgoat-container package docker:build
+```
+
+With the following command you are able to run the Docker container on your local machine:
+
+```Shell
+docker run -p 8080:8080 -t webgoat/webgoat-container
+docker ps
+```
+
+With the last command you are able to determine ip address to connect to.
+At the moment the Docker image is not distributed to a Docker registry.
\ No newline at end of file
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index cf8ae6909..d37c2cba7 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -113,6 +113,22 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.10</version>
+                <configuration>
+                    <imageName>webgoat/${project.artifactId}</imageName>
+                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.war</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -182,21 +198,23 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <requiresUnpack>
-                                <dependency>
-                                    <groupId>org.thymeleaf.extra</groupId>
-                                    <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-                                </dependency>
-                            </requiresUnpack>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <!-- See http://docs.spring.io/spring-boot/docs/current/reference/html/howto-build.html#howto-extract-specific-libraries-when-an-executable-jar-runs -->
+                    <requiresUnpack>
+                        <dependency>
+                            <groupId>org.thymeleaf.extra</groupId>
+                            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.jruby</groupId>
+                            <artifactId>jruby-complete</artifactId>
+                        </dependency>
+                    </requiresUnpack>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -322,7 +340,11 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.spotify</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>0.4.10</version>
+        </dependency>
 
         <!-- ************* END spring MVC and related dependencies ************** -->
         <!-- ************* START: Dependencies for Unit and Integration Testing ************** -->
diff --git a/webgoat-container/src/main/docker/Dockerfile b/webgoat-container/src/main/docker/Dockerfile
new file mode 100644
index 000000000..d9198d7db
--- /dev/null
+++ b/webgoat-container/src/main/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM frolvlad/alpine-oraclejdk8:slim
+VOLUME /tmp
+ADD webgoat-container-7.1-SNAPSHOT.war webgoat.jar
+RUN sh -c 'touch /webgoat.jar'
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/webgoat.jar"]
\ No newline at end of file
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
index 6e9f854f0..1600f559a 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
@@ -27,8 +27,8 @@ import java.util.concurrent.CompletionService;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
  * <p>PluginsLoader class.</p>
@@ -58,11 +58,11 @@ public class PluginsLoader {
     public List<Plugin> loadPlugins() {
         List<Plugin> plugins = Lists.newArrayList();
         try {
-            File jarFile = new File(this.getClass().getProtectionDomain().getCodeSource().getLocation().getFile());
-            if (jarFile.isDirectory()) {
-                extractToTempDirectoryFromExplodedDirectory(jarFile);
+            URL location = this.getClass().getProtectionDomain().getCodeSource().getLocation();
+            if (ResourceUtils.isFileURL(location)) {
+                extractToTempDirectoryFromExplodedDirectory(ResourceUtils.getFile(location));
             } else {
-                extractToTempDirectoryFromJarFile(jarFile);
+                extractToTempDirectoryFromJarFile(ResourceUtils.getFile(ResourceUtils.extractJarFileURL(location)));
             }
             List<URL> jars = listJars();
             plugins = processPlugins(jars);
@@ -73,7 +73,7 @@ public class PluginsLoader {
     }
 
     private void extractToTempDirectoryFromJarFile(File jarFile) throws IOException {
-        JarFile jar = new JarFile(jarFile);
+        ZipFile jar = new ZipFile(jarFile);
         Enumeration<? extends ZipEntry> entries = jar.entries();
         while (entries.hasMoreElements()) {
             ZipEntry zipEntry = entries.nextElement();
@@ -83,7 +83,7 @@ public class PluginsLoader {
         }
     }
 
-    private void unpack(JarFile jar, ZipEntry zipEntry) throws IOException {
+    private void unpack(ZipFile jar, ZipEntry zipEntry) throws IOException {
         try (InputStream inputStream = jar.getInputStream(zipEntry)) {
             String name = zipEntry.getName();
             if (name.lastIndexOf("/") != -1) {