diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
index efc0826..f78259d 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
@@ -163,6 +163,7 @@
 
     private static final String[] BEAN_DEFINING_ANNOTATION_CLASSES =
     {
+            Named.class.getName(),
             FacesComponent.class.getName(),
             FacesBehavior.class.getName(),
             FacesConverter.class.getName(),
@@ -321,8 +322,14 @@
             combinedIndex.getIndex()
                     .getAnnotations(DotName.createSimple(clazz))
                     .stream()
-                    .forEach(annotation -> recorder.registerAnnotatedClass(annotation.name().toString(),
-                            annotation.target().asClass().name().toString()));
+                    .forEach(annotation -> 
+                    {
+                        if (annotation.target().kind() == AnnotationTarget.Kind.CLASS)
+                        {
+                            recorder.registerAnnotatedClass(annotation.name().toString(),
+                                    annotation.target().asClass().name().toString());
+                        }
+                    });
         }
     }
 
