diff --git a/project-suppression.xml b/config/dependency-check/project-suppression.xml
similarity index 95%
rename from project-suppression.xml
rename to config/dependency-check/project-suppression.xml
index 3c9ed0ae3..a2a8e8470 100644
--- a/project-suppression.xml
+++ b/config/dependency-check/project-suppression.xml
@@ -32,6 +32,8 @@
         <cpe>cpe:/a:xstream_project:xstream</cpe>
         <cve>CVE-2017-7957</cve>
         <cve>CVE-2016-3674</cve>
+        <cve>CVE-2020-26217</cve>
+        <cve>CVE-2020-26258</cve>
     </suppress>
     <suppress base="true"><!-- webgoat-server -->
         <cpe>cpe:/a:postgresql:postgresql</cpe>
diff --git a/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml
similarity index 100%
rename from pmd-ruleset.xml
rename to config/pmd/pmd-ruleset.xml
diff --git a/pom.xml b/pom.xml
index 5f3626a15..f31fdfb91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.3</version>
     </parent>
 
     <licenses>
@@ -126,7 +126,7 @@
         <commons-collections.version>3.2.1</commons-collections.version>
         <commons-lang3.version>3.4</commons-lang3.version>
         <commons-io.version>2.6</commons-io.version>
-        <guava.version>18.0</guava.version>
+        <guava.version>30.1</guava.version>
         <lombok.version>1.18.4</lombok.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
@@ -168,63 +168,33 @@
         </dependency>
     </dependencies>
 
-<build>
-	<plugins>
-	<plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.2.5</version>
-        <configuration>
-        </configuration>
-        <executions>
-          <execution>
-            <id>flatten</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>flatten</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<configuration>
-				<source>11</source>
-				<target>11</target>
-				<encoding>UTF-8</encoding>
-			</configuration>
-		</plugin>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-checkstyle-plugin</artifactId>
-			<version>3.1.0</version>
-			<configuration>
-				<encoding>UTF-8</encoding>
-				<consoleOutput>true</consoleOutput>
-				<failsOnError>true</failsOnError>
-				<configLocation>config/checkstyle/checkstyle.xml</configLocation>
-				<suppressionsLocation>config/checkstyle/suppressions.xml</suppressionsLocation>
-				<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-			</configuration>
-		</plugin>
-	</plugins>
-</build>
-
-<profiles>
-	<profile>
-		<id>defaultProfile</id>
-		<activation>
-			<activeByDefault>true</activeByDefault>
-		</activation>		
-	</profile>
-	<profile>
-		<id>owasp</id>
-		<activation>
-			<activeByDefault>false</activeByDefault>
-		</activation>
-		    <build>
+    <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.5</version>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -239,51 +209,50 @@
                 </configuration>
             </plugin>
             <plugin>
-      				<groupId>org.apache.maven.plugins</groupId>
-      				<artifactId>maven-pmd-plugin</artifactId>
-      				<version>3.13.0</version>
-      				<configuration>
-      					<targetJdk>11</targetJdk>
-      					<failurePriority>1</failurePriority><!-- 5 means fail even on the lowest
-      						priority, 0 means never fail -->
-      					<rulesets>
-      						<ruleset>${maven.multiModuleProjectDirectory}/pmd-ruleset.xml</ruleset>
-      					</rulesets>
-      					<failOnViolation>true</failOnViolation>
-      					<printFailingErrors>true</printFailingErrors>
-      				</configuration>
-      				<executions>
-      					<execution>
-      						<goals>
-      							<goal>check</goal>
-      						</goals>
-      					</execution>
-      				</executions>
-      			</plugin>
-      			<plugin>
-      				<groupId>org.owasp</groupId>
-      				<artifactId>dependency-check-maven</artifactId>
-      				<version>5.3.2</version>
-      				<configuration>
-      					<failBuildOnCVSS>7</failBuildOnCVSS>
-      					<skipProvidedScope>true</skipProvidedScope>
-                          <skipRuntimeScope>true</skipRuntimeScope>
-      					<suppressionFiles>
-                              <suppressionFile>project-suppression.xml</suppressionFile>
-                          </suppressionFiles>
-      				</configuration>
-      				<executions>
-      					<execution>
-      						<goals>
-      							<goal>check</goal>
-      						</goals>
-      					</execution>
-      				</executions>
-      			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.14.0</version>
+                <configuration>
+                    <targetJdk>11</targetJdk>
+                    <failurePriority>1</failurePriority><!-- 5 means fail even on the lowest priority, 0 means never fail -->
+                    <rulesets>
+                        <!--suppress UnresolvedMavenProperty -->
+                        <ruleset>${maven.multiModuleProjectDirectory}/config/pmd/pmd-ruleset.xml</ruleset>
+                    </rulesets>
+                    <failOnViolation>true</failOnViolation>
+                    <printFailingErrors>true</printFailingErrors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>5.3.2</version>
+                <configuration>
+                    <failBuildOnCVSS>7</failBuildOnCVSS>
+                    <skipProvidedScope>true</skipProvidedScope>
+                    <skipRuntimeScope>true</skipRuntimeScope>
+                    <suppressionFiles>
+                        <!--suppress UnresolvedMavenProperty -->
+                        <suppressionFile>${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml</suppressionFile>
+                    </suppressionFiles>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-	</profile>
-</profiles>
 
     <repositories>
         <repository>
diff --git a/webwolf/pom.xml b/webwolf/pom.xml
index fb1f5e4ee..6ac70d4c8 100644
--- a/webwolf/pom.xml
+++ b/webwolf/pom.xml
@@ -109,6 +109,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>