diff --git a/tycho.yaml b/tycho.yaml
index 1118e15..4774bce 100644
--- a/tycho.yaml
+++ b/tycho.yaml
@@ -31,7 +31,7 @@ data:
         - buildrequires:
               javapackages-tools: [201801]
               tycho: ["1.5"]
-              platform: ["f30", "f31"]
+              platform: ["f31"]
           requires:
               javapackages-tools: [201801]
               platform: []
@@ -39,12 +39,10 @@ data:
         default:
             rpms:
                 - tycho
-                - tycho-extras
     api:
         rpms:
-            - cbi-plugins
             - tycho
-            - tycho-extras
+            - cbi-plugins
             - xml-maven-plugin
     buildopts:
         rpms:
@@ -56,82 +54,82 @@ data:
         rpms:
             auto:
                 buildorder: 20
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of cbi-plugins.
                     Build dependency of cbi-plugins.
             batik:
                 buildorder: 20
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             cbi-plugins:
                 buildorder: 50
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
                     Build dependency of eclipse.
             decentxml:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of cbi-plugins, tycho.
                     Build dependency of cbi-plugins, tycho.
             ecj:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of tycho.
                     Build dependency of glassfish-jsp, tycho.
             eclipse:
                 buildorder: 80
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
             eclipse-ecf:
                 buildorder: 70
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             eclipse-emf:
                 buildorder: 60
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse, eclipse-ecf.
             eclipse-license:
                 buildorder: 50
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Build dependency of eclipse, eclipse-ecf.
             felix-gogo-command:
                 buildorder: 30
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             felix-gogo-parent:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Build dependency of felix-gogo-command,
                          felix-gogo-runtime, felix-gogo-shell.
             felix-gogo-runtime:
                 buildorder: 20
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, felix-gogo-command,
@@ -140,106 +138,99 @@ data:
                          felix-gogo-shell, felix-scr.
             felix-gogo-shell:
                 buildorder: 30
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             felix-scr:
                 buildorder: 30
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             glassfish-jsp:
                 buildorder: 20
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             google-gson:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             icu4j:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             javapoet:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of auto.
                     Build dependency of auto.
             jetty:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             lucene:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
             sac:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             sat4j:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, tycho.
                     Build dependency of eclipse, tycho.
             takari-polyglot:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of tycho-extras.
-                    Build dependency of tycho-extras.
+                    Runtime dependency of tycho.
+                    Build dependency of tycho.
             tycho:
                 buildorder: 40
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of cbi-plugins, tycho-extras.
+                    Runtime dependency of cbi-plugins.
                     Build dependency of cbi-plugins, eclipse, eclipse-ecf,
-                         eclipse-emf, eclipse-license, tycho-extras.
-            tycho-extras:
-                buildorder: 50
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-                    Build dependency of eclipse, eclipse-ecf, eclipse-emf.
+                         eclipse-emf, eclipse-license.
             xml-maven-plugin:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Build dependency of eclipse.
             xmlgraphics-commons:
                 buildorder: 10
-                ref: tycho
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of batik.