diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a81a9e..4009e78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.4
+* Automatic version detection: If multiple versions are found it now uses the "highest" version
+
 # 1.0.3
 * Updated dependencies
 
diff --git a/testcontainers/src/main/java/software/xdev/testcontainers/mockserver/containers/MockServerUtils.java b/testcontainers/src/main/java/software/xdev/testcontainers/mockserver/containers/MockServerUtils.java
index 480e98b..98c0095 100644
--- a/testcontainers/src/main/java/software/xdev/testcontainers/mockserver/containers/MockServerUtils.java
+++ b/testcontainers/src/main/java/software/xdev/testcontainers/mockserver/containers/MockServerUtils.java
@@ -17,6 +17,7 @@
 
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Objects;
@@ -104,7 +105,10 @@ static synchronized String determineClasspathMockserverVersion()
 			return DEFAULT_VERSION;
 		}
 		
-		final String foundVersion = versions.iterator().next();
+		// Multiple versions? -> Use highest
+		final String foundVersion = versions.stream()
+			.max(Comparator.naturalOrder())
+			.orElseThrow();
 		if(versions.size() > 1)
 		{
 			LOG.warn(
diff --git a/testcontainers/src/test/java/software/xdev/testcontainers/mockserver/containers/MockServerUtilTest.java b/testcontainers/src/test/java/software/xdev/testcontainers/mockserver/containers/MockServerUtilTest.java
index cecfc1d..f80bc37 100644
--- a/testcontainers/src/test/java/software/xdev/testcontainers/mockserver/containers/MockServerUtilTest.java
+++ b/testcontainers/src/test/java/software/xdev/testcontainers/mockserver/containers/MockServerUtilTest.java
@@ -25,7 +25,7 @@ class MockServerUtilTest
 	void checkVersionDetection()
 	{
 		Assertions.assertEquals(
-			"1.2.3",
+			"9999.2.3",
 			MockServerUtils.determineClasspathMockserverVersion());
 	}
 }
diff --git a/testcontainers/src/test/resources/META-INF/MANIFEST.MF b/testcontainers/src/test/resources/META-INF/MANIFEST.MF
index 60e1c0e..c879c3b 100644
--- a/testcontainers/src/test/resources/META-INF/MANIFEST.MF
+++ b/testcontainers/src/test/resources/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 
 Name: Mockserver-Info
-Version: 1.2.3
+Version: 9999.2.3