diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml
index 59e61e7278..27ac141532 100644
--- a/plugins/tasks/ansible/pom.xml
+++ b/plugins/tasks/ansible/pom.xml
@@ -121,8 +121,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/asserts/pom.xml b/plugins/tasks/asserts/pom.xml
index 14436ff358..ab0319adde 100644
--- a/plugins/tasks/asserts/pom.xml
+++ b/plugins/tasks/asserts/pom.xml
@@ -42,8 +42,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml
index 2e5e50e4e0..17e5d62a94 100644
--- a/plugins/tasks/concord/pom.xml
+++ b/plugins/tasks/concord/pom.xml
@@ -99,8 +99,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml
index 15dd5a88ce..3a43317634 100644
--- a/plugins/tasks/crypto/pom.xml
+++ b/plugins/tasks/crypto/pom.xml
@@ -38,8 +38,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml
index 08c74eb707..0dd4980c74 100644
--- a/plugins/tasks/docker/pom.xml
+++ b/plugins/tasks/docker/pom.xml
@@ -38,8 +38,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml
index 763a9744e9..fa854d41fd 100644
--- a/plugins/tasks/dynamic-tasks/pom.xml
+++ b/plugins/tasks/dynamic-tasks/pom.xml
@@ -48,8 +48,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml
index 938991bde4..c95285e288 100644
--- a/plugins/tasks/example/pom.xml
+++ b/plugins/tasks/example/pom.xml
@@ -40,8 +40,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml
index 44e05389dc..71190c0138 100644
--- a/plugins/tasks/files/pom.xml
+++ b/plugins/tasks/files/pom.xml
@@ -28,8 +28,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml
index 2bdc3a0ebc..9005b137aa 100644
--- a/plugins/tasks/http/pom.xml
+++ b/plugins/tasks/http/pom.xml
@@ -108,8 +108,15 @@
 
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml
index 783fa3df99..ef2a19a749 100644
--- a/plugins/tasks/kv/pom.xml
+++ b/plugins/tasks/kv/pom.xml
@@ -38,8 +38,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml
index 6010d5fc99..9d0c6c8762 100644
--- a/plugins/tasks/locale/pom.xml
+++ b/plugins/tasks/locale/pom.xml
@@ -33,8 +33,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml
index 05afae6fda..72d04e3748 100644
--- a/plugins/tasks/lock/pom.xml
+++ b/plugins/tasks/lock/pom.xml
@@ -43,8 +43,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml
index f83cff954a..6e8ef6e7e7 100644
--- a/plugins/tasks/log/pom.xml
+++ b/plugins/tasks/log/pom.xml
@@ -65,8 +65,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml
index 7774abbdc7..7e936108e0 100644
--- a/plugins/tasks/misc/pom.xml
+++ b/plugins/tasks/misc/pom.xml
@@ -38,8 +38,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/mock/pom.xml b/plugins/tasks/mock/pom.xml
index 8b25aa8163..f87507a3b5 100644
--- a/plugins/tasks/mock/pom.xml
+++ b/plugins/tasks/mock/pom.xml
@@ -99,8 +99,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml
index 140c3d76d3..51f551528c 100644
--- a/plugins/tasks/noderoster/pom.xml
+++ b/plugins/tasks/noderoster/pom.xml
@@ -54,8 +54,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml
index fbaad9b466..439312c110 100644
--- a/plugins/tasks/resource/pom.xml
+++ b/plugins/tasks/resource/pom.xml
@@ -85,8 +85,12 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml
index 55252042aa..959fd46357 100644
--- a/plugins/tasks/slack/pom.xml
+++ b/plugins/tasks/slack/pom.xml
@@ -70,8 +70,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml
index ab8f588413..3be80f3d92 100644
--- a/plugins/tasks/sleep/pom.xml
+++ b/plugins/tasks/sleep/pom.xml
@@ -44,8 +44,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml
index 202cce4a37..9b4e37b351 100644
--- a/plugins/tasks/smtp/pom.xml
+++ b/plugins/tasks/smtp/pom.xml
@@ -94,8 +94,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml
index 83b227c422..9620032096 100644
--- a/plugins/tasks/throw/pom.xml
+++ b/plugins/tasks/throw/pom.xml
@@ -33,8 +33,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <configuration>
+                    <!-- no verify, as this plugin depends on runtime-v2 -->
+                    <skipVerify>true</skipVerify>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml
index 573ffd8d61..c00e816044 100644
--- a/plugins/tasks/variables/pom.xml
+++ b/plugins/tasks/variables/pom.xml
@@ -38,8 +38,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
+                <groupId>dev.ybrig.concord</groupId>
+                <artifactId>concord-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.walmartlabs.concord.runtime.v2</groupId>
+                        <artifactId>concord-runner-v2</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index a9942acc83..1708de3d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,6 +350,22 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>dev.ybrig.concord</groupId>
+                    <artifactId>concord-maven-plugin</artifactId>
+                    <version>0.0.31</version>
+                    <configuration>
+                        <concordVersion>${project.version}</concordVersion>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>sisu-index</goal>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>