diff --git a/eclipse.yaml b/eclipse.yaml
index a088ab9..8e00d70 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -13,6 +13,7 @@ data:
     dependencies:
         - buildrequires:
               tycho: ["1.6"]
+              eclipse: ["latest"]
               platform: ["-f28", "-f29"]
           requires:
               platform: ["-f28", "-f29"]
@@ -74,7 +75,6 @@ data:
                 - eclipse-swt
                 - eclipse-usage
                 - eclipse-webtools-common
-                - eclipse-webtools-dali
                 - eclipse-webtools-javaee
                 - eclipse-webtools-servertools
                 - eclipse-webtools-sourceediting
@@ -171,14 +171,12 @@ data:
             - eclipse-swt
             - eclipse-usage
             - eclipse-webtools-common
-            - eclipse-webtools-dali
             - eclipse-webtools-javaee
             - eclipse-webtools-servertools
             - eclipse-webtools-sourceediting
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
@@ -189,6 +187,24 @@ data:
                 %_without_hsqldb 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