diff --git a/tycho.yaml b/tycho.yaml
index 047af21..d66367e 100644
--- a/tycho.yaml
+++ b/tycho.yaml
@@ -29,11 +29,8 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              javapackages-tools: [201801]
-              tycho: [1.4]
-              platform: [f30, f31]
+              platform: ["f30", "f31"]
           requires:
-              javapackages-tools: [201801]
               platform: []
     profiles:
         default:
@@ -45,21 +42,15 @@ data:
             - cbi-plugins
             - tycho
             - tycho-extras
-            - takari-tycho-support
     buildopts:
         rpms:
             macros: |
+                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_contrib_tools 1
+                %_without_junit5 1
     components:
         rpms:
-            apache-commons-el:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse.
-                    Build dependency of eclipse.
             auto:
                 buildorder: 20
                 ref: tycho
@@ -93,15 +84,14 @@ data:
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of takari-lifecycle, tycho.
+                    Runtime dependency of tycho.
                     Build dependency of glassfish-jsp, tycho.
             eclipse:
                 buildorder: 80
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of takari-lifecycle.
-                    Build dependency of takari-lifecycle.
+                    Module API.
             eclipse-ecf:
                 buildorder: 70
                 ref: tycho
@@ -122,22 +112,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Build dependency of eclipse, eclipse-ecf.
-            eclipse-m2e-workspace:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-lifecycle,
-                         takari-plugin-testing.
-                    Build dependency of takari-lifecycle,
-                         takari-plugin-testing.
-            fasterxml-oss-parent:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of jackson-parent.
-                    Build dependency of jackson-parent.
             felix-gogo-command:
                 buildorder: 30
                 ref: tycho
@@ -187,8 +161,8 @@ data:
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse, takari-lifecycle.
-                    Build dependency of eclipse, takari-lifecycle.
+                    Runtime dependency of eclipse.
+                    Build dependency of eclipse.
             icu4j:
                 buildorder: 10
                 ref: tycho
@@ -196,48 +170,13 @@ data:
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
-            jackson-annotations:
-                buildorder: 30
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of jackson-databind.
-                    Build dependency of jackson-databind.
-            jackson-bom:
-                buildorder: 30
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Build dependency of jackson-core, jackson-databind.
-            jackson-core:
-                buildorder: 40
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of jackson-databind, mustache-java.
-                    Build dependency of jackson-databind, mustache-java.
-            jackson-databind:
-                buildorder: 50
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of mustache-java.
-                    Build dependency of mustache-java.
-            jackson-parent:
-                buildorder: 20
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of jackson-bom.
-                    Build dependency of jackson-annotations, jackson-bom.
             javapoet:
                 buildorder: 10
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of auto, takari-incrementalbuild.
-                    Build dependency of auto, takari-incrementalbuild,
-                         takari-lifecycle.
+                    Runtime dependency of auto.
+                    Build dependency of auto.
             jetty:
                 buildorder: 10
                 ref: tycho
@@ -259,19 +198,6 @@ data:
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
-            mustache-java:
-                buildorder: 60
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-lifecycle.
-                    Build dependency of takari-lifecycle.
-            replacer:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Build dependency of jackson-core, jackson-databind.
             sac:
                 buildorder: 10
                 ref: tycho
@@ -286,46 +212,6 @@ data:
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
-            takari-archiver:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-lifecycle.
-                    Build dependency of takari-lifecycle.
-            takari-incrementalbuild:
-                buildorder: 20
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-lifecycle.
-                    Build dependency of takari-lifecycle.
-            takari-lifecycle:
-                buildorder: 90
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-pom.
-                    Build dependency of takari-pom.
-            takari-plugin-testing:
-                buildorder: 20
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Build dependency of takari-lifecycle.
-            takari-pom:
-                buildorder: 100
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of takari-tycho-support.
-                    Build dependency of takari-tycho-support.
-            takari-tycho-support:
-                buildorder: 110
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
             tesla-polyglot:
                 buildorder: 10
                 ref: tycho
@@ -339,11 +225,9 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of cbi-plugins,
-                         takari-tycho-support, tycho-extras.
+                    Runtime dependency of cbi-plugins, tycho-extras.
                     Build dependency of cbi-plugins, eclipse, eclipse-ecf,
-                         eclipse-emf, eclipse-license, takari-tycho-support,
-                         tycho-extras.
+                         eclipse-emf, eclipse-license, tycho-extras.
             tycho-extras:
                 buildorder: 50
                 ref: tycho