diff --git a/client/pom.xml b/client/pom.xml
index ff861b778d7..9323d0fb20f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -279,6 +279,26 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.7</version>
         <executions>
+          <!-- Copy the systemvm in the package phase as it is generated 
+               by console-proxy in the package phase. 
+          -->
+          <execution>
+            <id>copy-systemvm</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
+                  <fileset dir="${basedir}/../services/console-proxy/server/dist">
+                    <include name="systemvm.zip" />
+                    <include name="systemvm.iso" />
+                  </fileset>
+                </copy>
+              </target>
+            </configuration>
+          </execution>
           <execution>
             <id>generate-resource</id>
             <phase>generate-resources</phase>
@@ -306,12 +326,6 @@
                     <include name="resources/**/*" />
                   </fileset>
                 </copy>
-                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
-                  <fileset dir="${basedir}/../services/console-proxy/server/dist">
-                    <include name="systemvm.zip" />
-                    <include name="systemvm.iso" />
-                  </fileset>
-                </copy>
                 <copy todir="${basedir}/target/generated-webapp">
                   <fileset dir="${basedir}/../ui" />
                 </copy>
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 0df7559781e..f57b4caddd6 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -139,6 +139,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+            <filesets>
+                <fileset>
+                    <directory>dist</directory>
+                    <followSymlinks>false</followSymlinks>
+                </fileset>
+            </filesets>
+        </configuration>
+    </plugin>
 <!-- Leave this to the systemvm profile
      Enable using the -P systemvm flag
       <plugin>