diff --git a/Jenkinsfile b/Jenkinsfile
index 91354a681..c15f75642 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,7 +106,7 @@ pipeline {
                                 // -Dmaven.compiler.fork=true: Do compile in a separate forked process
                                 // -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail
                                 // -Pci-build: Profile for CI-Server
-                                sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
+                                sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Pci-build -T${THREADS}"
                             }
                 }
             }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
index 7f12f2f6c..6d18560b2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
@@ -36,6 +36,13 @@
       <Policies>
         <TimeBasedTriggeringPolicy />
       </Policies>
+      <DefaultRolloverStrategy max="30">
+        <Delete basePath="${logsDirectory}" maxDepth="2">
+          <IfFileName glob="*/*.log">
+            <IfLastModified age="P30D"/>
+          </IfFileName>
+        </Delete>
+      </DefaultRolloverStrategy>
     </RollingRandomAccessFile>
 
     <RollingRandomAccessFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
@@ -47,6 +54,13 @@
       <Policies>
         <TimeBasedTriggeringPolicy />
       </Policies>
+      <DefaultRolloverStrategy max="30">
+        <Delete basePath="${logsDirectory}" maxDepth="2">
+          <IfFileName glob="*/*.log">
+            <IfLastModified age="P30D"/>
+          </IfFileName>
+        </Delete>
+      </DefaultRolloverStrategy>
     </RollingRandomAccessFile>
 
     <RollingRandomAccessFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"