diff --git a/OomphIncubator.setup b/OomphIncubator.setup
index f064199..4849128 100644
--- a/OomphIncubator.setup
+++ b/OomphIncubator.setup
@@ -325,7 +325,7 @@
           <operand
               xsi:type="predicates:RepositoryPredicate"
               project="org.eclipse.oomph.incubator"
-              relativePathPattern="maven/.*"/>
+              relativePathPattern="maven(-bnd)?/.*"/>
         </predicate>
       </workingSet>
       <workingSet
diff --git a/orbit/pom.xml b/orbit/pom.xml
index 93d2812..a5c2e72 100644
--- a/orbit/pom.xml
+++ b/orbit/pom.xml
@@ -67,7 +67,7 @@
                 <applicationsArg>--action</applicationsArg>
                 <applicationsArg>${simrel.aggregator.build.type}</applicationsArg>
               </applicationsArgs>
-              <executionEnvironment>JavaSE-11</executionEnvironment>
+              <executionEnvironment>JavaSE-17</executionEnvironment>
               <jvmArgs>
                 <jvmArg>-Xms256M</jvmArg>
                 <jvmArg>-Xmx2048M</jvmArg>