diff --git a/eclipse.yaml b/eclipse.yaml
index f103a42..cef3264 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -85,7 +85,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of docker-client-java, eclipse-jgit,
+                    Runtime dependency of docker-client-java, jgit,
                          jython, plexus-archiver.
             apache-commons-discovery:
                 buildorder: 10
@@ -117,13 +117,13 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit.
+                    Runtime dependency of jgit.
             args4j:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of closure-compiler, eclipse-jgit.
+                    Runtime dependency of closure-compiler, jgit.
             base64coder:
                 buildorder: 10
                 ref: eclipse
@@ -154,7 +154,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of apache-sshd, docker-client-java,
-                         eclipse-jgit, jython, okhttp.
+                         jgit, jython, okhttp.
             closure-compiler:
                 buildorder: 20
                 ref: eclipse
@@ -180,7 +180,7 @@ data:
                 rationale: >
                     Module API.
             eclipse-cdt:
-                buildorder: 60
+                buildorder: 70
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -188,7 +188,7 @@ data:
                     Runtime dependency of eclipse-linuxtools,
                          eclipse-remote.
             eclipse-dtp:
-                buildorder: 20
+                buildorder: 30
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -201,7 +201,7 @@ data:
                 rationale: >
                     Runtime dependency of eclipse.
             eclipse-egit:
-                buildorder: 40
+                buildorder: 50
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -209,7 +209,7 @@ data:
                     Runtime dependency of eclipse-egit-github,
                          eclipse-m2e-egit, eclipse-tm-terminal.
             eclipse-egit-github:
-                buildorder: 50
+                buildorder: 60
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -228,7 +228,7 @@ data:
                     Module API.
                     Runtime dependency of eclipse-abrt, eclipse-usage.
             eclipse-gef:
-                buildorder: 10
+                buildorder: 20
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -236,7 +236,7 @@ data:
                     Runtime dependency of eclipse-dtp, eclipse-linuxtools,
                          eclipse-subclipse, eclipse-webtools.
             eclipse-jgit:
-                buildorder: 30
+                buildorder: 40
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -251,7 +251,7 @@ data:
                     Module API.
                     Runtime dependency of eclipse-cdt.
             eclipse-linuxtools:
-                buildorder: 80
+                buildorder: 90
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -309,7 +309,7 @@ data:
                 rationale: >
                     Module API.
             eclipse-mpc:
-                buildorder: 10
+                buildorder: 90
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -330,7 +330,7 @@ data:
                 rationale: >
                     Module API.
             eclipse-remote:
-                buildorder: 70
+                buildorder: 80
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -349,7 +349,7 @@ data:
                 rationale: >
                     Module API.
             eclipse-tm-terminal:
-                buildorder: 50
+                buildorder: 60
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -362,7 +362,7 @@ data:
                 rationale: >
                     Module API.
             eclipse-webtools:
-                buildorder: 30
+                buildorder: 40
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -374,7 +374,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of apache-sshd, eclipse-jgit.
+                    Runtime dependency of apache-sshd, jgit.
             felix-gogo-command:
                 buildorder: 20
                 ref: eclipse
@@ -466,7 +466,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of closure-compiler, eclipse, eclipse-cdt, eclipse-egit-github,
-                         eclipse-epp-logging, eclipse-jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng,
+                         eclipse-epp-logging, jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng,
                          eclipse-webtools, testng-remote.
             icu4j:
                 buildorder: 10
@@ -532,7 +532,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit.
+                    Runtime dependency of jgit.
             javaparser:
                 buildorder: 10
                 ref: eclipse
@@ -570,7 +570,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse, eclipse-jgit,
+                    Runtime dependency of eclipse, jgit,
                          eclipse-m2e-core, eclipse-webtools.
             jffi:
                 buildorder: 10
@@ -578,6 +578,13 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jnr-ffi, jython.
+            jgit:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+                    Runtime dependency of eclipse-jgit.
             jline:
                 buildorder: 10
                 ref: eclipse
@@ -722,7 +729,7 @@ data:
                 rationale: >
                     Runtime dependency of eclipse-m2e-wtp.
             nekohtml:
-                buildorder: 10
+                buildorder: 80
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
@@ -839,7 +846,7 @@ data:
                 rationale: >
                     Runtime dependency of eclipse-subclipse.
             swt-chart:
-                buildorder: 70
+                buildorder: 80
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >