diff --git a/pom.xml b/pom.xml
index 233ed05..64b8efa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,20 +153,6 @@
                     <legacyMode>true</legacyMode>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>io.github.dmlloyd.module-info</groupId>
-                <artifactId>module-info</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>module-info</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..da96643
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,18 @@
+module org.wildfly.common {
+    requires java.compiler;
+    requires java.xml;
+    requires java.transaction.xa;
+    requires java.sql;
+
+    requires io.smallrye.common.cpu;
+    requires io.smallrye.common.expression;
+    requires io.smallrye.common.net;
+    requires io.smallrye.common.os;
+    requires io.smallrye.common.ref;
+
+    requires org.jboss.logging;
+
+    requires static io.smallrye.common.function;
+
+    requires static org.jboss.logging.annotations;
+}
\ No newline at end of file
diff --git a/src/main/java/module-info.yml b/src/main/java/module-info.yml
deleted file mode 100644
index 7b02221..0000000
--- a/src/main/java/module-info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: org.wildfly.common
-
-requires:
-  - module: java.sql
-  - module: java.transaction.xa
-  - module: java.xml
-  - module: io.smallrye.common.cpu
-  - module: io.smallrye.common.expression
-  - module: io.smallrye.common.net
-  - module: io.smallrye.common.os
-  - module: io.smallrye.common.ref
-  - module: org.jboss.logging