diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/TomcatFactory.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/TomcatFactory.java
index 6aa05e729b72..28d0f9e0ac1b 100644
--- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/TomcatFactory.java
+++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/TomcatFactory.java
@@ -465,6 +465,8 @@ private static TomEEVersion getTomEEVersion(String version, TomEEVersion default
             return TomcatManager.TomEEVersion.TOMEE_80;
         } else if (version.startsWith("9.")) { // NOI18N
             return TomcatManager.TomEEVersion.TOMEE_90;
+        } else if (version.startsWith("10.")) { // NOI18N
+            return TomcatManager.TomEEVersion.TOMEE_100;
         }
         return defaultVersion;
     }
diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/deploy/TomcatManager.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/deploy/TomcatManager.java
index 0147f5eae1a8..72f9d6246a66 100644
--- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/deploy/TomcatManager.java
+++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/deploy/TomcatManager.java
@@ -520,11 +520,11 @@ public boolean isJpa30() {
     }
 
     public boolean isJpa31() {
-        return false;
+        return isTomEE10();
     }
     
     public boolean isJpa32() {
-        return isTomEE10();
+        return false;
     }
 
     public boolean isJpa22() {
diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
index fdb6a4accf0c..c0524e950475 100644
--- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
+++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
@@ -465,7 +465,7 @@ public Set<Profile> getSupportedProfiles() {
             if (manager.getTomEEType().ordinal() >= 3 ) {
                 switch (manager.getTomEEVersion()) {
                     case TOMEE_100:
-                        profiles.add(Profile.JAKARTA_EE_11_FULL);
+                        profiles.add(Profile.JAKARTA_EE_10_FULL);
                     case TOMEE_90:
                         profiles.add(Profile.JAKARTA_EE_9_1_FULL);
                         break;
@@ -481,7 +481,7 @@ public Set<Profile> getSupportedProfiles() {
             }
             switch (manager.getTomEEVersion()) {
                 case TOMEE_100:
-                    profiles.add(Profile.JAKARTA_EE_11_WEB);
+                    profiles.add(Profile.JAKARTA_EE_10_WEB);
                 case TOMEE_90:
                     profiles.add(Profile.JAKARTA_EE_9_1_WEB);
                     break;