diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml
new file mode 100644
index 00000000..0cc67cd2
--- /dev/null
+++ b/.config/topo/upstream.yml
@@ -0,0 +1,2 @@
+- url: https://github.com/xdev-software/standard-maven-template.git
+  branch: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6062f3b3..31fa7882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.50.5
+* Bumped version to one that does not conflict with testcontainers (and will likely not do so in the foreseeable future) #403
+* Updated dependencies
+
 # 2.0.4
 * Updated dependencies
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 26f4ba43..3268d5e4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>bom</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>bom</name>
@@ -51,22 +51,22 @@
 			<dependency>
 				<groupId>software.xdev.mockserver</groupId>
 				<artifactId>client</artifactId>
-				<version>2.0.5-SNAPSHOT</version>
+				<version>2.50.5-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.mockserver</groupId>
 				<artifactId>core</artifactId>
-				<version>2.0.5-SNAPSHOT</version>
+				<version>2.50.5-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.mockserver</groupId>
 				<artifactId>server</artifactId>
-				<version>2.0.5-SNAPSHOT</version>
+				<version>2.50.5-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.mockserver</groupId>
 				<artifactId>testcontainers</artifactId>
-				<version>2.0.5-SNAPSHOT</version>
+				<version>2.50.5-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/client/pom.xml b/client/pom.xml
index 49dcdde1..c88db70f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>client</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>client</name>
@@ -223,7 +223,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.3.0</version>
+								<version>13.4.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -261,12 +261,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/core/pom.xml b/core/pom.xml
index 71af714c..84130fce 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>core</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>core</name>
@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.10.Final</version>
+				<version>4.2.12.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.1.0</version>
+			<version>3.1.1</version>
 		</dependency>
 
 		<dependency>
@@ -271,7 +271,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.3.0</version>
+								<version>13.4.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -309,12 +309,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/pom.xml b/pom.xml
index 3423cdcd..7f965033 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>root</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>MockServer NeoLight</name>
@@ -69,7 +69,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.3.0</version>
+								<version>13.4.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -107,12 +107,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/server/pom.xml b/server/pom.xml
index 931d309b..9e768fee 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>server</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>server</name>
@@ -56,7 +56,7 @@
 			<dependency>
 				<groupId>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
-				<version>4.2.10.Final</version>
+				<version>4.2.12.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -290,7 +290,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.3.0</version>
+								<version>13.4.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -328,12 +328,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml
index 629596be..ed1aab56 100644
--- a/testcontainers/pom.xml
+++ b/testcontainers/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.mockserver</groupId>
 	<artifactId>testcontainers</artifactId>
-	<version>2.0.5-SNAPSHOT</version>
+	<version>2.50.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>testcontainers</name>
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.3</version>
+			<version>2.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- Testcontainers is using outdated v1 -->
@@ -78,7 +78,7 @@
 		<dependency>
 			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>3.1.0</version>
+			<version>3.1.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -282,7 +282,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>13.3.0</version>
+								<version>13.4.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -320,12 +320,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.22.0</version>
+								<version>7.23.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>