diff --git a/pom.xml b/pom.xml
index 759c2550c7..b6248c76ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mapstore2.version>DEV</mapstore2.version>
-        <tomcat.version>8.5.69</tomcat.version>
+        <tomcat.version>9.0.90</tomcat.version>
         <tomcat.port>8080</tomcat.port>
         <geostore-webapp.version>2.2-SNAPSHOT</geostore-webapp.version>
         <print-lib.version>2.3.1</print-lib.version>
diff --git a/product/pom.xml b/product/pom.xml
index 46c1b5330d..85f4a436cf 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -10,7 +10,7 @@
     <packaging>war</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomcat.version>8.5.69</tomcat.version>
+        <tomcat.version>9.0.90</tomcat.version>
         <tomcat.port>8080</tomcat.port>
         <datadir.location>${env.MAPSTORE_DATA_DIR}</datadir.location>
         <security.integration>default</security.integration>
@@ -270,14 +270,14 @@
                 <version>1.10.2</version>
                 <configuration>
                     <container>
-                        <containerId>tomcat8x</containerId>
+                        <containerId>tomcat9x</containerId>
                         <systemProperties>
                             <datadir.location>${datadir.location}</datadir.location>
                             <security.integration>${security.integration}</security.integration>
                         </systemProperties>
                         <zipUrlInstaller>
                             <url>
-                                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip
+                                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip
                             </url>
                         </zipUrlInstaller>
                     </container>
diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml
index da038f55a1..6216169877 100644
--- a/project/standard/templates/web/pom.xml
+++ b/project/standard/templates/web/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomcat.version>8.5.69</tomcat.version>
+    <tomcat.version>9.0.90</tomcat.version>
     <tomcat.port>8080</tomcat.port>
     <mapstore-services.version>1.9-SNAPSHOT</mapstore-services.version>
     <geostore-webapp.version>2.1-SNAPSHOT</geostore-webapp.version>
@@ -401,9 +401,11 @@
             <artifactId>cargo-maven3-plugin</artifactId>
             <configuration>
                 <container>
-                    <containerId>tomcat8x</containerId>
+                    <containerId>tomcat9x</containerId>
                     <zipUrlInstaller>
-                        <url>https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip</url>
+                        <url>
+                            https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip
+                        </url>
                     </zipUrlInstaller>
                 </container>
                 <configuration>