diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..78013bc
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Dstyle.color=always
+-T1C
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a3cc8af..5ca564b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,9 @@
 	"cSpell.words": [
 		"raidbuilder",
 		"springframework"
-	]
+	],
+	"sonarlint.connectedMode.project": {
+		"connectionId": "mattrixwvSonarqube",
+		"projectKey": "RaidBuilderAPI"
+	}
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index e69de29..da4ca1c 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,3 @@
+# Raid Builder API
+
+[![Quality Gate Status](https://sonarqube.mattrixwv.com/api/project_badges/measure?project=RaidBuilderAPI&metric=alert_status&token=sqb_ab4c1e39be4304f908cc73a4c94c1b40577a4e9f)](https://sonarqube.mattrixwv.com/dashboard?id=RaidBuilderAPI)
diff --git a/dependencySuppression.xml b/dependencySuppression.xml
new file mode 100644
index 0000000..a35b822
--- /dev/null
+++ b/dependencySuppression.xml
@@ -0,0 +1,16 @@
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+	<suppress>
+		<notes><![CDATA[
+			Spring Boot devs say this is not a problem
+		]]></notes>
+		<packageUrl regex="true">^pkg:maven/org\.springframework/spring\-web@.*$</packageUrl>
+		<cve>CVE-2016-1000027</cve>
+	</suppress>
+	<suppress>
+		<notes><![CDATA[
+			False positive, CVE only affects plugins and devtools are not included in production builds
+		]]></notes>
+		<packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring-boot-devtools@.*$</packageUrl>
+		<cve>CVE-2022-31691</cve>
+	</suppress>
+</suppressions>
diff --git a/pom.xml b/pom.xml
index d2ed542..a2561c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.mattrixwv.raidbuilder</groupId>
@@ -10,23 +10,39 @@
 	<name>Raid Builder API</name>
 	<url>https://api.raidbuilder.mattrixwv.com</url>
 
+	<developers>
+		<developer>
+			<name>Matthew Ellison</name>
+			<email>m_ellison@ymail.com</email>
+			<url>https://git.mattrixwv.com/matthew</url>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:git:git://git.mattrixwv.com/HomeLab/RaidBuilderAPI.git</connection>
+		<developerConnection>scm:git:ssh://git.mattrixwv.com/HomeLab/RaidBuilderAPI.git</developerConnection>
+		<url>https://git.mattrixwv.com/HomeLab/RaidBuilderAPI</url>
+	</scm>
+
 	<properties>
 		<!--Compile-->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-		<java.version>21</java.version>
+		<maven.compiler.source>25</maven.compiler.source>
+		<maven.compiler.target>25</maven.compiler.target>
+		<java.version>25</java.version>
 
 		<!--Sonarqube-->
-		<sonar.java.source>21</sonar.java.source>
+		<sonar.java.source>25</sonar.java.source>
 		<sonar.dependencyCheck.jsonReportPath>target/dependency-check-report.json</sonar.dependencyCheck.jsonReportPath>
 		<sonar.dependencyCheck.htmlReportPath>target/dependency-check-report.html</sonar.dependencyCheck.htmlReportPath>
+
+		<argLine></argLine>
 	</properties>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.2</version>
 	</parent>
 
 	<dependencies>
@@ -85,6 +101,10 @@
 					<groupId>com.vaadin.external.google</groupId>
 					<artifactId>android-json</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -92,12 +112,12 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.7.8</version>
+			<version>42.7.9</version>
 		</dependency>
 		<dependency>
 			<groupId>io.hypersistence</groupId>
 			<artifactId>hypersistence-utils-hibernate-63</artifactId>
-			<version>3.14.1</version>
+			<version>3.15.1</version>
 		</dependency>
 
 		<!--! Jackson -->
@@ -109,7 +129,7 @@
 		<dependency>
 			<groupId>tools.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-hibernate6</artifactId>
-			<version>3.0.3</version>
+			<version>3.0.4</version>
 		</dependency>
 
 		<!--! Boilerplate Generator -->
@@ -150,161 +170,47 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.20.0</version>
+			<version>1.21.0</version>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
 			<!--Ensure maven is the correct version-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>enforce-maven</id>
 						<goals>
 							<goal>enforce</goal>
 						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>3.8.6</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.5.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.4.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.1</version>
-				<configuration>
-					<compilerArgs>
-						<arg>-Xlint:all</arg>
-						<arg>-proc:full</arg>
-					</compilerArgs>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>true</showDeprecation>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.4</version>
-				<configuration>
-					<skipTests>${skip.unit.tests}</skipTests>
-					<excludes>
-						<exclude>**/*IntegrationTest.java</exclude>
-					</excludes>
-					<classpathDependencyExcludes>
-						<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
-					</classpathDependencyExcludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.5.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>3.1.4</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.1.4</version>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>properties</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.5.4</version>
-				<executions>
-					<execution>
-						<configuration>
-							<skipITs>${skip.integration.tests}</skipITs>
-							<includes>
-								<include>**/*IntegrationTest.java</include>
-							</includes>
-							<classpathDependencyExcludes>
-								<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
-							</classpathDependencyExcludes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>3.21.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>3.9.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.20.1</version>
-				<configuration>
-					<rulesUri>file://${session.executionRootDirectory}/version-rules.xml</rulesUri>
-				</configuration>
 			</plugin>
+
 			<!--Sonarqube-->
-			<plugin>
-				<groupId>org.sonarsource.scanner.maven</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>5.5.0.6356</version>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.14</version>
-				<configuration>
-					<excludes>
-						<exclude>**/CipherStreamAPI*</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jacoco-initialize</id>
-						<phase>none</phase>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-site</id>
-						<phase>none</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.owasp</groupId>
 				<artifactId>dependency-check-maven</artifactId>
-				<version>12.1.9</version>
 				<executions>
 					<execution>
 						<phase>none</phase>
@@ -313,14 +219,162 @@
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<formats>
-						<format>json</format>
-						<format>html</format>
-					</formats>
-					<nvdApiServerId>nvd</nvdApiServerId>
-				</configuration>
 			</plugin>
 		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+				</plugin>
+				<!--Ensure maven is the correct version-->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>3.6.2</version>
+					<configuration>
+						<rules>
+							<requireMavenVersion>
+								<version>3.8.6</version>
+							</requireMavenVersion>
+						</rules>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.5.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.4.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.14.1</version>
+					<configuration>
+						<compilerArgs>
+							<arg>-Xlint:all</arg>
+							<arg>-proc:full</arg>
+							<arg>-Xlint:-serial</arg>
+							<arg>-Xlint:-processing</arg>
+						</compilerArgs>
+						<showWarnings>true</showWarnings>
+						<showDeprecation>true</showDeprecation>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>3.5.4</version>
+					<configuration>
+						<skipTests>${skip.unit.tests}</skipTests>
+						<excludes>
+							<exclude>**/*IntegrationTest.java</exclude>
+						</excludes>
+						<classpathDependencyExcludes>
+							<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
+						</classpathDependencyExcludes>
+						<argLine>@{argLine} -Xshare:off -javaagent:${org.mockito:mockito-core:jar}</argLine>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.5.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>3.1.4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.1.4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>3.5.4</version>
+					<configuration>
+						<skipITs>${skip.integration.tests}</skipITs>
+						<includes>
+							<include>**/*IntegrationTest.java</include>
+						</includes>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.21.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-project-info-reports-plugin</artifactId>
+					<version>3.9.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>versions-maven-plugin</artifactId>
+					<version>2.21.0</version>
+					<configuration>
+						<rulesUri>file://${session.executionRootDirectory}/version-rules.xml</rulesUri>
+					</configuration>
+				</plugin>
+				<!--Sonarqube-->
+				<plugin>
+					<groupId>org.sonarsource.scanner.maven</groupId>
+					<artifactId>sonar-maven-plugin</artifactId>
+					<version>5.5.0.6356</version>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>0.8.14</version>
+					<configuration>
+						<excludes>
+							<exclude>**/RaidBuilderAPI*</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>jacoco-initialize</id>
+							<phase>none</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>jacoco-site</id>
+							<phase>none</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.owasp</groupId>
+					<artifactId>dependency-check-maven</artifactId>
+					<version>12.2.0</version>
+					<configuration>
+						<formats>
+							<format>json</format>
+							<format>html</format>
+						</formats>
+						<nvdApiServerId>nvd</nvdApiServerId>
+						<failBuildOnCVSS>7</failBuildOnCVSS>
+						<ossIndexServerId>ossindex</ossIndexServerId>
+						<suppressionFiles>
+							<suppressionFile>${project.basedir}/dependencySuppression.xml</suppressionFile>
+						</suppressionFiles>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>