diff --git a/jmc.yaml b/jmc.yaml
index d127e8f..5f5cb80 100644
--- a/jmc.yaml
+++ b/jmc.yaml
@@ -20,11 +20,17 @@ data:
       - jmc-core
   dependencies:
     - buildrequires:
-        platform: []
+        platform: [f31, f32]
         tycho: [1.4]
       requires:
-        platform: []
+        platform: [f31, f32]
         eclipse: [2019-09]
+    - buildrequires:
+        platform: []
+        tycho: [1.6]
+      requires:
+        platform: []
+        eclipse: [latest]
   api:
     rpms:
     - jmc-core
@@ -48,9 +54,9 @@ data:
         ref: jmc
       javamail:
         rationale: Dependency of jmc
-        buildorder: 2
+        buildorder: 1
         ref: jmc
       jmc:
         rationale: Standalone application
-        buildorder: 3
+        buildorder: 2
         ref: jmc