diff --git a/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala b/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
index 6f11def2..5eb1aa95 100644
--- a/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
+++ b/src/main/scala/io/sdkman/changelogs/TomcatMigration.scala
@@ -6,19 +6,23 @@ import org.bson.Document
 
 @ChangeLog(order = "038")
 class TomcatMigration {
+
   @ChangeSet(
-    order = "012",
-    id = "012-update_tomcat_versions",
+    order = "014",
+    id = "014-update_tomcat_versions",
     author = "stefanpenndorf"
   )
-  def migration012(implicit db: MongoDatabase): Document = {
-    removeVersion("tomcat", "11.0.0-M5")
+  def migration014(implicit db: MongoDatabase): Document = {
+    removeVersion("tomcat", "11.0.0-M7")
 
     List(
-      "8"  -> "8.5.89",
-      "9"  -> "9.0.75",
-      "10" -> "10.1.9",
-      "11" -> "11.0.0-M6"
+      "8"  -> "8.5.91",
+      "8"  -> "8.5.92",
+      "9"  -> "9.0.78",
+      "9"  -> "9.0.79",
+      "10" -> "10.1.11",
+      "10" -> "10.1.12",
+      "11" -> "11.0.0-M10"
     ).map {
         case (series: String, version: String) =>
           Version(
@@ -30,22 +34,22 @@ class TomcatMigration {
       }
       .validate()
       .insert()
-    setCandidateDefault("tomcat", "10.1.9")
+    setCandidateDefault("tomcat", "10.1.12")
   }
 
   @ChangeSet(
-    order = "013",
-    id = "013-update_tomcat_versions",
+    order = "015",
+    id = "015-update_tomcat_versions",
     author = "stefanpenndorf"
   )
-  def migration013(implicit db: MongoDatabase): Document = {
-    removeVersion("tomcat", "11.0.0-M6")
+  def migration015(implicit db: MongoDatabase): Document = {
+    removeVersion("tomcat", "11.0.0-M10")
 
     List(
-      "8"  -> "8.5.90",
-      "9"  -> "9.0.76",
-      "10" -> "10.1.10",
-      "11" -> "11.0.0-M7"
+      "8"  -> "8.5.94",
+      "9"  -> "9.0.81",
+      "10" -> "10.1.14",
+      "11" -> "11.0.0-M12"
     ).map {
         case (series: String, version: String) =>
           Version(
@@ -57,25 +61,22 @@ class TomcatMigration {
       }
       .validate()
       .insert()
-    setCandidateDefault("tomcat", "10.1.10")
+    setCandidateDefault("tomcat", "10.1.14")
   }
 
   @ChangeSet(
-    order = "014",
-    id = "014-update_tomcat_versions",
+    order = "016",
+    id = "016-update_tomcat_versions",
     author = "stefanpenndorf"
   )
-  def migration014(implicit db: MongoDatabase): Document = {
-    removeVersion("tomcat", "11.0.0-M7")
+  def migration016(implicit db: MongoDatabase): Document = {
+    removeVersion("tomcat", "11.0.0-M12")
 
     List(
-      "8"  -> "8.5.91",
-      "8"  -> "8.5.92",
-      "9"  -> "9.0.78",
-      "9"  -> "9.0.79",
-      "10" -> "10.1.11",
-      "10" -> "10.1.12",
-      "11" -> "11.0.0-M10"
+      "8"  -> "8.5.96",
+      "9"  -> "9.0.83",
+      "10" -> "10.1.16",
+      "11" -> "11.0.0-M14"
     ).map {
         case (series: String, version: String) =>
           Version(
@@ -87,22 +88,22 @@ class TomcatMigration {
       }
       .validate()
       .insert()
-    setCandidateDefault("tomcat", "10.1.12")
+    setCandidateDefault("tomcat", "10.1.16")
   }
 
   @ChangeSet(
-    order = "015",
-    id = "015-update_tomcat_versions",
+    order = "017",
+    id = "017-update_tomcat_versions",
     author = "stefanpenndorf"
   )
-  def migration015(implicit db: MongoDatabase): Document = {
-    removeVersion("tomcat", "11.0.0-M10")
+  def migration017(implicit db: MongoDatabase): Document = {
+    removeVersion("tomcat", "11.0.0-M14")
 
     List(
-      "8"  -> "8.5.94",
-      "9"  -> "9.0.81",
-      "10" -> "10.1.14",
-      "11" -> "11.0.0-M12"
+      "8"  -> "8.5.98",
+      "9"  -> "9.0.85",
+      "10" -> "10.1.18",
+      "11" -> "11.0.0-M16"
     ).map {
         case (series: String, version: String) =>
           Version(
@@ -114,7 +115,7 @@ class TomcatMigration {
       }
       .validate()
       .insert()
-    setCandidateDefault("tomcat", "10.1.14")
+    setCandidateDefault("tomcat", "10.1.18")
   }
 
 }