diff --git a/pom.xml b/pom.xml
index 3c7e7723b..cbdc5450f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
   <properties>
     <!-- If run from Bamboo this will be replaced with the bamboo build number -->
     <build.number>local</build.number>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <modules>
     <module>webgoat-container</module>
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index e8a172bc5..cab488a1c 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -41,6 +41,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>create-jar</id>
@@ -108,7 +109,7 @@
                     <dependency>
                         <groupId>org.owasp.webgoat</groupId>
                         <artifactId>webgoat-classloader</artifactId>
-                        <version>6.1.0</version>
+                        <version>${project.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.owasp.webgoat</groupId>
@@ -179,11 +180,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.3.2</version>
         </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2.1</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -235,12 +231,6 @@
             <artifactId>hsqldb</artifactId>
             <version>1.8.0.10</version>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
@@ -335,13 +325,6 @@
             <version>1.2.2</version>
         </dependency>
 
-        <!-- Apache Commons Upload -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>