diff --git a/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala b/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
index 31e037bb..b160359c 100644
--- a/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
+++ b/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
@@ -144,4 +144,31 @@ class TomcatMigration {
     setCandidateDefault("tomcat", "10.1.14")
   }
 
+  @ChangeSet(
+    order = "017",
+    id = "017-update_tomcat_versions",
+    author = "stefanpenndorf"
+  )
+  def migration017(implicit db: MongoDatabase): Document = {
+    removeVersion("tomcat", "11.0.0-M19")
+    removeVersion("tomcat", "8.5.100") // Tomcat 8.5 EOL on March, 31st 2024
+
+    List(
+      "9"  -> "9.0.95",
+      "10" -> "10.1.30",
+      "11" -> "11.0.0-M26"
+    ).map {
+        case (series: String, version: String) =>
+          Version(
+            candidate = "tomcat",
+            version = version,
+            url =
+              s"https://archive.apache.org/dist/tomcat/tomcat-$series/v$version/bin/apache-tomcat-$version.zip"
+          )
+      }
+      .validate()
+      .insert()
+    setCandidateDefault("tomcat", "10.1.30")
+  }
+
 }