diff --git a/tycho.yaml b/tycho.yaml
index 9d6f77c..da13482 100644
--- a/tycho.yaml
+++ b/tycho.yaml
@@ -48,12 +48,13 @@ data:
     filter:
         rpms:
             - auto
+            - auto-factory
             - auto-javadoc
             - cbi-plugins-javadoc
             - decentxml-javadoc
-            - javapoet-javadoc
             - tesla-polyglot
             - tesla-polyglot-atom
+            - tesla-polyglot-groovy
             - tesla-polyglot-javadoc
             - tesla-polyglot-maven-plugin
             - tesla-polyglot-translate-plugin
@@ -64,6 +65,7 @@ data:
     buildopts:
         rpms:
             macros: |
+                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_groovy 1
     components:
@@ -88,11 +90,6 @@ data:
                 ref: master
                 rationale: >
                     Runtime dependency of tycho.
-            javapoet:
-                buildorder: 0
-                ref: master
-                rationale: >
-                    Runtime dependency of auto.
             tesla-polyglot:
                 buildorder: 10
                 ref: master