diff --git a/vaadin-core-jandex/pom.xml b/vaadin-core-jandex/pom.xml
index 6bd7fb8c7..9a8742015 100644
--- a/vaadin-core-jandex/pom.xml
+++ b/vaadin-core-jandex/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
-            <version>2.3.0.Final</version>
+            <version>3.1.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -65,9 +65,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
-                <version>1.1.0</version>
+                <version>3.1.6</version>
                 <executions>
                     <execution>
                         <id>make-index</id>
diff --git a/vaadin-jandex/pom.xml b/vaadin-jandex/pom.xml
index 500daa049..5a4ccdf96 100644
--- a/vaadin-jandex/pom.xml
+++ b/vaadin-jandex/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
-            <version>2.3.0.Final</version>
+            <version>3.1.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -65,9 +65,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.jboss.jandex</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
-                <version>1.1.0</version>
+                <version>3.1.6</version>
                 <executions>
                     <execution>
                         <id>make-index</id>