diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 59aa9a078..991b1faaa 100644
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -161,12 +161,6 @@
         <!-- This configuration is added to cleanup from war:inplace -->
         <configuration>
           <filesets>
-            <fileset>
-              <directory>${basedir}/</directory>
-              <includes>
-                <include>derby.log</include>
-              </includes>
-            </fileset>
             <fileset>
               <directory>${basedir}/src/main/webapp</directory>
               <includes>
@@ -237,7 +231,11 @@
           <systemProperties>
             <systemProperty>
               <name>appserver.base</name>
-              <value>${basedir}/target</value>
+              <value>${project.build.directory}/appserver-base</value>
+            </systemProperty>
+            <systemProperty>
+              <name>derby.system.home</name>
+              <value>${project.build.directory}/appserver-base/logs</value>
             </systemProperty>
           </systemProperties>
         </configuration>