diff --git a/.gitignore b/.gitignore
index 85aaaaa..6418f7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .tags.list
-.download/
\ No newline at end of file
+.download/
+.oomph/
\ No newline at end of file
diff --git a/setup/config_bndtools.p2.repo.setup b/setup/config_bndtools.p2.repo.setup
new file mode 100644
index 0000000..3400280
--- /dev/null
+++ b/setup/config_bndtools.p2.repo.setup
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Configuration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    label="bnd">
+  <installation
+      name="bndtools.installation"
+      label="bndtools Installation">
+    <productVersion
+        href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.products']/@products[name='epp.package.committers']/@versions[name='latest']"/>
+    <description>The bnd installation provides cool stuff.</description>
+  </installation>
+  <workspace
+      name="bndtools.workspace"
+      label="bndtools Workspace">
+    <setupTask
+        xsi:type="setup:VariableTask"
+        id="bndtools-release"
+        type="URI"
+        name="bndtools-release"
+        value="https://bndtools.jfrog.io/bndtools/update-snapshot"
+        label="bndtools-release">
+      <choice
+          value="https://bndtools.org/bndtools.p2.repo/7.0.0/"
+          label="rel 7.0.0"/>
+      <choice
+          value="https://bndtools.org/bndtools.p2.repo/6.4.1/"
+          label="rel 6.41"/>
+      <choice
+          value="https://bndtools.jfrog.io/bndtools/update-latest"
+          label="release (JFrog)"/>
+      <choice
+          value="https://bndtools.jfrog.io/bndtools/update-snapshot"
+          label="snapshot (JFrog)"/>
+    </setupTask>
+    <stream
+        href="prj-bnd.setup#//@streams[name='master']"/>
+    <stream
+        href="prj-bndtools.p2.repo.setup#//@streams[name='master']"/>
+    <description>The bnd workspace provides cool stuff.</description>
+  </workspace>
+  <description>The bnd configuration provides cool stuff.</description>
+</setup:Configuration>
diff --git a/setup/prj-bndtools.p2.repo.setup b/setup/prj-bndtools.p2.repo.setup
index 1d27d35..23382f1 100644
--- a/setup/prj-bndtools.p2.repo.setup
+++ b/setup/prj-bndtools.p2.repo.setup
@@ -5,11 +5,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
-    xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
     xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Maven.ecore http://www.eclipse.org/oomph/setup/projects/1.0 index:/models/Projects.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/projects/1.0 index:/models/Projects.ecore"
     name="bndtools"
     label="bndtools/bnd">
   <annotation
@@ -43,7 +42,7 @@
   </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
-      id="git.clone.bnd"
+      id="git.clone.bndtools.p2.repo"
       remoteURI="bndtools/bndtools.p2.repo">
     <annotation
         source="http://www.eclipse.org/oomph/setup/InducedChoices">
@@ -196,119 +195,8 @@
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${git.clone.bnd.location}"
-          locateNestedProjects="true">
-        <excludedPath>bndtools.test</excludedPath>
-        <excludedPath>bndtools.core.test/resource</excludedPath>
-      </sourceLocator>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.jdt.core">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-          value="17"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance"
-          value="17"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures"
-          value="disabled"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures"
-          value="warning"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source"
-          value="17"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.egit.ui">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.egit.ui/commit_dialog_signed_off_by"
-          value="true"/>
-    </setupTask>
-  </stream>
-  <stream name="next"
-      label="Next">
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        disabled="true"
-        option="-Doomph.redirection.bndtools"
-        value="=https://raw.githubusercontent.com/bndtools/bnd/master/.../BndtoolsBnd.setup->${git.clone.bnd.location|uri}/.../BndtoolsBnd.setup"
-        vm="true">
-      <description>
-        Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.
-        Before enabling this task, replace '...' with the repository path of this setup's containing project.
-      </description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="bndtools">
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="bndtools">
-        <requirement
-            name="bndtools.main.feature.feature.group"/>
-        <requirement
-            name="bndtools.m2e.feature.feature.group"/>
-        <requirement
-            name="bndtools.pde.feature.feature.group"/>
-        <repository
-            url="${bndtools-release}"/>
-      </setupTask>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="JRE">
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="JRE17">
-        <requirement
-            name="a.jre.org.eclipse.justj.openjdk.hotspot.jre.full"
-            versionRange="[17.0.0,17.0.0]"/>
-        <repository
-            url="https://download.eclipse.org/justj/jres/17/updates/release"/>
-      </setupTask>
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="JRE21">
-        <requirement
-            name="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group"/>
-        <repository
-            url="https://download.eclipse.org/justj/jres/21/updates/release"/>
-      </setupTask>
-      <setupTask
-          xsi:type="jdt:JRETask"
-          version="JavaSE-17"
-          location="${jre.location-17}"
-          name="JRE for JavaSE-17">
-        <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
-        <defaultExecutionEnvironment>JavaSE-17</defaultExecutionEnvironment>
-      </setupTask>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.bnd.location}"
-          locateNestedProjects="true">
-        <excludedPath>biz.aQute.bndlib.tests</excludedPath>
-        <excludedPath>biz.aQute.repository</excludedPath>
-        <excludedPath>bndtools.test</excludedPath>
-        <excludedPath>bndtools.core.test</excludedPath>
-        <excludedPath>maven-plugins</excludedPath>
-      </sourceLocator>
-    </setupTask>
-    <setupTask
-        xsi:type="maven:MavenImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.bnd.location}/maven-plugins"/>
+          rootFolder="${git.clone.bndtools.p2.repo.location}"
+          locateNestedProjects="true"/>
     </setupTask>
     <setupTask
         xsi:type="setup:CompoundTask"