diff --git a/client/pom.xml b/client/pom.xml
index 3fa6d9117..862024ea6 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -89,18 +89,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-lifecycle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>sisu-index</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index 6d9ff7b6c..1e4a36fb4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -73,18 +73,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-lifecycle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>sisu-index</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/daemon/pom.xml b/daemon/pom.xml
index 9b6208790..a7d37bdc6 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -84,6 +84,13 @@
             <artifactId>jline-terminal</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>${sisu.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -99,18 +106,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-lifecycle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>sisu-index</goal>
-                        </goals>
-                        <phase>process-classes</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index e3d82ff49..c6a9efa1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
         <maven.version>3.8.5</maven.version>
         <maven.resolver.version>1.7.3</maven.resolver.version>
         <slf4j.version>1.7.35</slf4j.version>
+        <sisu.version>0.3.5</sisu.version>
 
         <!-- plugin versions a..z -->
         <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
@@ -249,6 +250,12 @@
                 <version>0.8.1-SNAPSHOT</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.eclipse.sisu</groupId>
+                <artifactId>org.eclipse.sisu.inject</artifactId>
+                <version>${sisu.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.jline</groupId>
                 <artifactId>jline-terminal</artifactId>
@@ -362,11 +369,6 @@ limitations under the License.</inlineHeader>
                         </dependency>
                     </dependencies>
                 </plugin>
-                <plugin>
-                    <groupId>io.takari.maven.plugins</groupId>
-                    <artifactId>takari-lifecycle-plugin</artifactId>
-                    <version>${takari-lifecycle.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>