diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
index 19bc47292e61..711855ee3566 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
@@ -232,12 +232,16 @@ private List<URL> selectJars(FileObject file) {
     }
 
     public List<URL> getClasses() {
-        List<URL> list = selectJars(FileUtil.toFileObject(new File(getModulePath("javax"))));
+        List<URL> classes = new ArrayList<>();
+
+        classes.addAll(selectJars(FileUtil.toFileObject(new File(getModulePath("jakarta")))));
+        classes.addAll(selectJars(FileUtil.toFileObject(new File(getModulePath("javax")))));
+
         File glassfish = new File(getModulePath("org/glassfish/javax"));
         if(glassfish.exists()) {
-            list.addAll(selectJars(FileUtil.toFileObject(glassfish)));
+            classes.addAll(selectJars(FileUtil.toFileObject(glassfish)));
         }
-        return list;
+        return classes;
     }
 
     public List<URL> getSources() {