diff --git a/pom.xml b/pom.xml
index 179a1203..9b882e8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
-	  <timestamp>${maven.build.timestamp}</timestamp>
+		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss Z</maven.build.timestamp.format>
 
 		<maven.compiler.release>22</maven.compiler.release>
+
+		<!-- Plugin Versions -->
+		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+		<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
+		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+		<cxf-codegen-plugin.version>4.0.5</cxf-codegen-plugin.version>
+
+		<!-- Dependency Versions -->
+		<junit-jupiter.version>5.10.3</junit-jupiter.version>
 	</properties>
 
 	<build>
@@ -24,12 +33,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>${maven-source-plugin.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.12.1</version>
+					<version>${maven-compiler-plugin.version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -39,7 +48,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-jar-plugin</artifactId>
-			<version>2.3.1</version>
+			<version>${maven-jar-plugin.version}</version>
 			<configuration>
 				<archive>
 					<addMavenDescriptor>false</addMavenDescriptor>
@@ -47,8 +56,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 						<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 					</manifest>
 					<manifestEntries>
-<!--						<Revision>${SVN_REVISION}</Revision>-->
-<!--						<BuildTag>${BUILD_TAG}</BuildTag>-->
 						<BuildTimestamp>${maven.build.timestamp}</BuildTimestamp>
 						<JDKVersion>${maven.compiler.release}</JDKVersion>
 					</manifestEntries>
@@ -59,7 +66,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-surefire-plugin</artifactId>
-			<version>2.19.1</version>
+			<version>${maven-surefire-plugin.version}</version>
 		</plugin>
 
 		<plugin>
@@ -94,7 +101,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<plugin>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-codegen-plugin</artifactId>
-			<version>4.1.3</version>
+			<version>${cxf-codegen-plugin.version}</version>
 			<executions>
 				<execution>
 					<id>generate-sources</id>
@@ -251,8 +258,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 			<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter -->
 			<!-- MIT License https://www.eclipse.org/legal/epl-v20.html -->
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>RELEASE</version>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -282,14 +289,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
 	<distributionManagement>
 		<repository>
-			<id>gitea-maven-repo</id>
+			<id>gitea</id>
 			<name>Gitea Release Repository</name>
 			<url>https://gs.kapdion.com/api/v1/packages/KapDion/maven</url>
 		</repository>
 		<snapshotRepository>
-			<id>gitea-maven-repo</id>
+			<id>gitea</id>
 			<name>Gitea Snapshot Repository</name>
 			<url>https://gs.kapdion.com/api/v1/packages/KapDion/maven</url>
+			<uniqueVersion>false</uniqueVersion>
 		</snapshotRepository>
 	</distributionManagement>