diff --git a/client/pom.xml b/client/pom.xml
index c5371100c02..1525a7c88f2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -114,6 +114,12 @@
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -155,8 +161,17 @@
             </connector>
           </connectors>
           <contextPath>/client</contextPath>
-          <webXml>./WEB-INF/web.xml</webXml>
-          <webAppSourceDirectory>./target/generated-webapp</webAppSourceDirectory>
+          <webXml>${basedir}/WEB-INF/web.xml</webXml>
+          <webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>2.0-beta-1</version>
+        <configuration>
+          <tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml>
+          <warSourceDirectory>./target/generated-webapp</warSourceDirectory>
         </configuration>
       </plugin>
       <plugin>
diff --git a/server/pom.xml b/server/pom.xml
index 3731f71bccb..f7178d8eb0a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>${cs.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>