diff --git a/classloader/pom.xml b/classloader/pom.xml
index 8ef473fc..3b6ffbb6 100644
--- a/classloader/pom.xml
+++ b/classloader/pom.xml
@@ -33,15 +33,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>coverage</id>
diff --git a/classloader/src/main/java/module-info.java b/classloader/src/main/java/module-info.java
new file mode 100644
index 00000000..9f2b1e98
--- /dev/null
+++ b/classloader/src/main/java/module-info.java
@@ -0,0 +1,2 @@
+module io.smallrye.common.classloader {
+}
\ No newline at end of file
diff --git a/io/pom.xml b/io/pom.xml
index 1ea56eaa..e7502fe1 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -25,15 +25,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>coverage</id>
diff --git a/io/src/main/java/module-info.java b/io/src/main/java/module-info.java
new file mode 100644
index 00000000..67643f83
--- /dev/null
+++ b/io/src/main/java/module-info.java
@@ -0,0 +1,2 @@
+module io.smallrye.common.io {
+}
\ No newline at end of file
diff --git a/os/pom.xml b/os/pom.xml
index 8e0c8475..7a40be73 100644
--- a/os/pom.xml
+++ b/os/pom.xml
@@ -19,15 +19,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>coverage</id>
diff --git a/os/src/main/java/module-info.java b/os/src/main/java/module-info.java
new file mode 100644
index 00000000..4cd56330
--- /dev/null
+++ b/os/src/main/java/module-info.java
@@ -0,0 +1,2 @@
+module io.smallrye.common.os {
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 879a4348..ad7cd85a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
     <properties>
         <!-- Plugins -->
         <version.bridger>1.6.Final</version.bridger>
-        <version.module-info>2.1</version.module-info>
         <version.sundrio>0.200.0</version.sundrio>
         <version.jandex-maven-plugin>1.2.3</version.jandex-maven-plugin>
 
@@ -153,31 +152,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <!-- TODO - Workaround for javadoc / module-info generation -->
-                <!-- The javadoc plugin expects a module-info.java (because it finds the .class generated one), and
-                     because we don't have one, it fails. Forcing to legacy mode removes any module configuration for the
-                     javadoc command
-                -->
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <configuration>
-                        <legacyMode>true</legacyMode>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>io.github.dmlloyd.module-info</groupId>
-                    <artifactId>module-info</artifactId>
-                    <version>${version.module-info}</version>
-                    <executions>
-                        <execution>
-                            <id>module-info</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.jboss.bridger</groupId>
                     <artifactId>bridger</artifactId>