diff --git a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/config/configure.xml b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/config/configure.xml
index f34edabc..db961342 100644
--- a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/config/configure.xml
+++ b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/config/configure.xml
@@ -101,6 +101,7 @@
                     <value>TOMCAT_VER_70</value>
                     <value>TOMCAT_VER_80</value>
                     <value>TOMCAT_VER_85</value>
+                    <value>TOMCAT_VER_90</value>
                 </skipIf>
                 <i18n key="INT_GLOBAL_WEB_XML" group="tomcatv6Tools"/>
                 <default-value-finder>
diff --git a/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/IConstants.java b/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/IConstants.java
index f5f3c0e6..af06f6cd 100644
--- a/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/IConstants.java
+++ b/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/IConstants.java
@@ -115,6 +115,7 @@ public interface IConstants {
     public static final String TOMCAT_VER_70 = "TOMCAT_VER_70";
     public static final String TOMCAT_VER_80 = "TOMCAT_VER_80";
     public static final String TOMCAT_VER_85 = "TOMCAT_VER_85";
+    public static final String TOMCAT_VER_90 = "TOMCAT_VER_90";
     public static final String STR_WEBAPP_DIR = "webapps";
     public static final String STR_AGENT_APP_WAR_FILE = "agentapp.war";
     public static final String INSTANCE_CONFIG_DIR_NAME = "config";
diff --git a/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidator.java b/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidator.java
index 5d4a41e2..6a3b0d53 100644
--- a/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidator.java
+++ b/jee-agents-tomcat/jee-agents-tomcat-v6/src/main/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidator.java
@@ -212,6 +212,8 @@ public static String getTomcatVersion(String serverInfo) {
                 result = TOMCAT_VER_80;
             } else if (versionLine.startsWith("8.5")) {
                 result = TOMCAT_VER_85;
+            } else if (versionLine.startsWith("9.0")) {
+                result = TOMCAT_VER_90;
             }
 
             Debug.log("TomcatVersionValidator.getTomcatVersion() - version:" + versionLine +
diff --git a/jee-agents-tomcat/jee-agents-tomcat-v6/src/test/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidatorTest.java b/jee-agents-tomcat/jee-agents-tomcat-v6/src/test/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidatorTest.java
index 142aba8b..22d908b2 100644
--- a/jee-agents-tomcat/jee-agents-tomcat-v6/src/test/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidatorTest.java
+++ b/jee-agents-tomcat/jee-agents-tomcat-v6/src/test/java/com/sun/identity/agents/tools/tomcat/v6/TomcatVersionValidatorTest.java
@@ -83,6 +83,15 @@ public class TomcatVersionValidatorTest {
     		"Architecture:   amd64\n" + 
     		"JVM Version:    1.8.0_181-b13\n" + 
     		"JVM Vendor:     Oracle Corporation\n";
+    
+    public static final String LINUX_TOMCAT90_SERVERINFO = "Server version: Apache Tomcat/9.0.80\n" + 
+                "Server built:   Aug 23 2023 21:59:38 UTC\n" + 
+                "Server number:  9.0.80.0\n" + 
+                "OS Name:        Linux\n" + 
+                "OS Version:     5.15.0-83-generic\n" + 
+                "Architecture:   amd64\n" + 
+                "JVM Version:    11.0.20.1+1-post-Ubuntu-0ubuntu122.04\n" + 
+                "JVM Vendor:     Ubuntu\n";
 
     @Test
     public void testCheckTomcatVersionIsValid() {
@@ -93,6 +102,7 @@ public void testCheckTomcatVersionIsValid() {
         Assert.assertEquals(IConstants.TOMCAT_VER_70, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT7_SERVERINFO));
         Assert.assertEquals(IConstants.TOMCAT_VER_80, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT8_SERVERINFO));
         Assert.assertEquals(IConstants.TOMCAT_VER_85, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT85_SERVERINFO));
+        Assert.assertEquals(IConstants.TOMCAT_VER_90, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT90_SERVERINFO));
 
         Assert.assertNull(TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT5_SERVERINFO));
         Assert.assertNull(TomcatVersionValidator.getTomcatVersion(null));