diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt
index a6f1a19..4f2a35b 100644
--- a/mbi/dist/metadata.txt
+++ b/mbi/dist/metadata.txt
@@ -952,7 +952,7 @@ MOD servlet-api
 MOD sisu-inject
   ART org.eclipse.sisu org.eclipse.sisu.inject
     DEP javax.enterprise cdi-api
-MOD sisu-mojos
+MOD sisu-maven-plugin
   ART org.eclipse.sisu sisu-maven-plugin
     ALIAS org.sonatype.plugins sisu-maven-plugin
     DEP org.eclipse.sisu org.eclipse.sisu.inject
@@ -960,6 +960,7 @@ MOD sisu-mojos
     DEP org.apache.maven maven-plugin-api
     DEP org.apache.maven.shared maven-common-artifact-filters
     DEP org.codehaus.plexus plexus-utils
+    DEP org.sonatype.plexus plexus-build-api
 MOD sisu-plexus
   ART org.eclipse.sisu org.eclipse.sisu.plexus
     ALIAS org.sonatype.sisu sisu-inject-plexus
diff --git a/project/sisu-inject.properties b/project/sisu-inject.properties
deleted file mode 100644
index a81bab8..0000000
--- a/project/sisu-inject.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-url=https://github.com/eclipse/sisu.inject.git
-ref=releases/@.@.@
-version=0.3.5
diff --git a/project/sisu-inject.xml b/project/sisu-inject.xml
deleted file mode 100644
index 557fd21..0000000
--- a/project/sisu-inject.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<project>
-  <licensing>
-    <tag>EPL-1.0 AND BSD-3-Clause</tag>
-    <file>LICENSE.txt</file>
-  </licensing>
-  <module>
-    <dependency>guice</dependency>
-    <dependency>injection-api</dependency>
-    <dependency>slf4j</dependency>
-    <dependency>junit4</dependency>
-    <dependency>testng</dependency>
-    <dependency>osgi-core</dependency>
-    <dependency>common-annotations-api</dependency>
-    <dependency>servlet-api</dependency>
-    <dependency>cdi</dependency>
-    <build>
-      <compiler>
-        <addSourceRoot>org.eclipse.sisu.inject/src</addSourceRoot>
-      </compiler>
-    </build>
-  </module>
-</project>
diff --git a/project/sisu-mojos.properties b/project/sisu-mojos.properties
deleted file mode 100644
index e793a15..0000000
--- a/project/sisu-mojos.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-url=https://github.com/eclipse/sisu.mojos.git
-ref=releases/@.@.@
-version=0.3.5
diff --git a/project/sisu-mojos.xml b/project/sisu-mojos.xml
deleted file mode 100644
index 3ef22d0..0000000
--- a/project/sisu-mojos.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project>
-  <licensing>
-    <tag>EPL-1.0</tag>
-    <file>LICENSE.txt</file>
-  </licensing>
-  <module>
-    <dependency>maven-plugin-api</dependency>
-    <dependency>maven-plugin-tools</dependency>
-    <dependency>sisu-inject</dependency>
-    <dependency>plexus-utils</dependency>
-    <dependency>maven-core</dependency>
-    <dependency>maven-artifact</dependency>
-    <dependency>maven-model</dependency>
-    <dependency>maven-common-artifact-filters</dependency>
-    <build>
-      <compiler>
-        <addSourceRoot>src/main/java</addSourceRoot>
-      </compiler>
-      <pdc>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-      </pdc>
-    </build>
-  </module>
-</project>
diff --git a/project/sisu-plexus.properties b/project/sisu-plexus.properties
deleted file mode 100644
index 066fa22..0000000
--- a/project/sisu-plexus.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-url=https://github.com/eclipse/sisu.plexus.git
-ref=releases/@.@.@
-version=0.3.5
diff --git a/project/sisu-plexus.xml b/project/sisu-plexus.xml
deleted file mode 100644
index 77dd1e2..0000000
--- a/project/sisu-plexus.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<project>
-  <licensing>
-    <tag>EPL-1.0 AND BSD-3-Clause</tag>
-    <file>LICENSE.txt</file>
-  </licensing>
-  <module>
-    <dependency>sisu-inject</dependency>
-    <dependency>injection-api</dependency>
-    <dependency>plexus-classworlds</dependency>
-    <dependency>plexus-component-annotations</dependency>
-    <dependency>guice</dependency>
-    <dependency>plexus-utils</dependency>
-    <dependency>slf4j</dependency>
-    <dependency>junit4</dependency>
-    <dependency>osgi-core</dependency>
-    <build>
-      <compiler>
-        <addSourceRoot>org.eclipse.sisu.plexus/src</addSourceRoot>
-      </compiler>
-      <plexus>
-        <gleanFromXML>org.eclipse.sisu.plexus/META-INF/plexus/components.xml</gleanFromXML>
-      </plexus>
-    </build>
-  </module>
-</project>
diff --git a/project/sisu.properties b/project/sisu.properties
new file mode 100644
index 0000000..390b7a5
--- /dev/null
+++ b/project/sisu.properties
@@ -0,0 +1,3 @@
+url=https://github.com/eclipse-sisu/sisu-project.git
+ref=milestones/@.@.@.@@
+version=0.9.0~M3
diff --git a/project/sisu.xml b/project/sisu.xml
new file mode 100644
index 0000000..36ce8cc
--- /dev/null
+++ b/project/sisu.xml
@@ -0,0 +1,66 @@
+<project>
+  <licensing>
+    <tag>EPL-1.0 AND BSD-3-Clause</tag>
+    <file>LICENSE.txt</file>
+  </licensing>
+  <module>
+    <name>sisu-inject</name>
+    <subDir>org.eclipse.sisu.inject</subDir>
+    <dependency>guice</dependency>
+    <dependency>injection-api</dependency>
+    <dependency>slf4j</dependency>
+    <dependency>junit4</dependency>
+    <dependency>junit5-jupiter</dependency>
+    <dependency>testng</dependency>
+    <dependency>osgi-core</dependency>
+    <dependency>common-annotations-api</dependency>
+    <dependency>servlet-api</dependency>
+    <dependency>cdi</dependency>
+    <build>
+      <compiler>
+        <addSourceRoot>src/main/java</addSourceRoot>
+      </compiler>
+    </build>
+  </module>
+  <module>
+    <name>sisu-plexus</name>
+    <subDir>org.eclipse.sisu.plexus</subDir>
+    <dependency>sisu-inject</dependency>
+    <dependency>injection-api</dependency>
+    <dependency>plexus-classworlds</dependency>
+    <dependency>plexus-component-annotations</dependency>
+    <dependency>guice</dependency>
+    <dependency>plexus-utils</dependency>
+    <dependency>slf4j</dependency>
+    <dependency>junit4</dependency>
+    <dependency>osgi-core</dependency>
+    <build>
+      <compiler>
+        <addSourceRoot>src/main/java</addSourceRoot>
+      </compiler>
+      <sisu/>
+    </build>
+  </module>
+  <module>
+    <name>sisu-maven-plugin</name>
+    <subDir>org.eclipse.sisu.mojos</subDir>
+    <dependency>maven-plugin-api</dependency>
+    <dependency>maven-plugin-tools</dependency>
+    <dependency>sisu-inject</dependency>
+    <dependency>plexus-utils</dependency>
+    <dependency>maven-core</dependency>
+    <dependency>maven-artifact</dependency>
+    <dependency>maven-model</dependency>
+    <dependency>maven-common-artifact-filters</dependency>
+    <dependency>plexus-build-api</dependency>
+    <build>
+      <compiler>
+        <addSourceRoot>src/main/java</addSourceRoot>
+      </compiler>
+      <pdc>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+      </pdc>
+    </build>
+  </module>
+</project>