diff --git a/eclipse.yaml b/eclipse.yaml
index bcff6e4..4969e0f 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -58,7 +58,6 @@ data:
                 - eclipse-swt
                 - eclipse-usage
                 - eclipse-webtools-common
-                - eclipse-webtools-javaee
                 - eclipse-webtools-servertools
                 - eclipse-webtools-sourceediting
         java:
@@ -132,7 +131,6 @@ data:
             - eclipse-swt
             - eclipse-usage
             - eclipse-webtools-common
-            - eclipse-webtools-javaee
             - eclipse-webtools-servertools
             - eclipse-webtools-sourceediting
     buildopts:
@@ -148,6 +146,24 @@ data:
                 %_without_junit5 1
     components:
         rpms:
+            eclipse:
+                buildorder: 40
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+            eclipse-ecf:
+                buildorder: 30
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
+            eclipse-emf:
+                buildorder: 20
+                ref: master
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse, eclipse-ecf.
             aether-connector-okhttp:
                 buildorder: 30
                 ref: eclipse
@@ -348,12 +364,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-cdt, glassfish-jaxb.
-            glassfish-jaxrpc-api:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-webtools.
             glassfish-jsp:
                 buildorder: 30
                 ref: master
@@ -378,7 +388,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-cdt, jgit,
-                         eclipse-m2e-core, eclipse-webtools.
+                         eclipse-m2e-core.
             icu4j:
                 buildorder: 10
                 ref: master