diff --git a/graalvm-hint-annotations/src/main/java/io/goodforgod/graalvm/hint/annotation/NativeImageOptions.java b/graalvm-hint-annotations/src/main/java/io/goodforgod/graalvm/hint/annotation/NativeImageOptions.java
index 7abda25..1fad983 100644
--- a/graalvm-hint-annotations/src/main/java/io/goodforgod/graalvm/hint/annotation/NativeImageOptions.java
+++ b/graalvm-hint-annotations/src/main/java/io/goodforgod/graalvm/hint/annotation/NativeImageOptions.java
@@ -33,9 +33,13 @@ public enum NativeImageOptions {
     ENABLE_URL_PROTOCOLS("--enable-url-protocols"),
     ALLOW_INCOMPLETE_CLASSPATH("--allow-incomplete-classpath"),
     REPORT_UNSUPPORTED("--report-unsupported-elements-at-runtime"),
+    EXIT_HANDLERS("--install-exit-handlers"),
+    STATIC("--static"),
+    STATIC_WITH_DYNAMIC("-H:+StaticExecutableWithDynamicLibC"),
     QUICK_BUILD("-Ob"),
     MAX_COMPATIBILITY("-march=compatibility"),
     MAX_PERFORMANCE("-march=native"),
+    UNLOCK_EXPERIMENTAL("-H:+UnlockExperimentalVMOptions"),
     BUILD_REPORT("-H:+BuildReport"),
     USE_LLVM("-H:CompilerBackend=llvm"),
     INLINE_BEFORE_ANALYSIS("-H:+InlineBeforeAnalysis"),
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractAccessHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractAccessHintProcessor.java
index 207898f..47dfc82 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractAccessHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractAccessHintProcessor.java
@@ -62,7 +62,7 @@ public int hashCode() {
 
     protected abstract String getFileName();
 
-    protected abstract Collection<Access> getGraalAccessForAnnotatedElement(TypeElement element);
+    protected abstract List<Access> getAccessForElement(TypeElement element);
 
     protected Set<TypeElement> getAnnotatedTypeElements(RoundEnvironment roundEnv) {
         final Class[] classes = getSupportedAnnotations().toArray(Class[]::new);
@@ -77,16 +77,26 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
         try {
             final Set<TypeElement> types = getAnnotatedTypeElements(roundEnv);
-            final List<Access> accesses = types.stream()
-                    .flatMap(element -> getGraalAccessForAnnotatedElement(element).stream())
-                    .distinct()
-                    .sorted()
-                    .collect(Collectors.toList());
-
-            final String configJson = getAccessConfigJson(accesses);
-            final HintOrigin origin = HintUtils.getHintOrigin(roundEnv, processingEnv);
-            final HintFile file = origin.getFileWithRelativePath(getFileName());
-            return HintUtils.writeConfigFile(file, configJson, processingEnv);
+
+            final Map<HintOrigin, Set<Access>> accessHints = new HashMap<>();
+            for (TypeElement type : types) {
+                final List<Access> typeAccesses = getAccessForElement(type);
+                if (!typeAccesses.isEmpty()) {
+                    final HintOrigin origin = HintUtils.getHintOrigin(type, processingEnv);
+                    final Set<Access> accesses = accessHints.computeIfAbsent(origin, k -> new LinkedHashSet<>());
+                    accesses.addAll(typeAccesses);
+                }
+            }
+
+            for (var entry : accessHints.entrySet()) {
+                final String configJson = getAccessConfigJson(entry.getValue());
+                final HintFile file = entry.getKey().getFileWithRelativePath(getFileName());
+                if (!HintUtils.writeConfigFile(file, configJson, processingEnv)) {
+                    return false;
+                }
+            }
+
+            return true;
         } catch (Exception e) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, e.getMessage());
             e.printStackTrace();
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractHintProcessor.java
index a451bbb..1e46f67 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/AbstractHintProcessor.java
@@ -29,14 +29,14 @@ public Set<String> getSupportedOptions() {
     @Override
     public SourceVersion getSupportedSourceVersion() {
         SourceVersion sourceVersion = SourceVersion.latest();
-        if (sourceVersion.ordinal() <= 19) {
+        if (sourceVersion.ordinal() <= 22) {
             if (sourceVersion.ordinal() >= 11) {
                 return sourceVersion;
             } else {
                 return SourceVersion.RELEASE_11;
             }
         } else {
-            return SourceVersion.values()[19];
+            return SourceVersion.values()[22];
         }
     }
 }
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintParser.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintParser.java
index 77a1644..c64db43 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintParser.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintParser.java
@@ -16,7 +16,6 @@
  *
  * @author Anton Kurako (GoodforGod)
  * @see DynamicProxyHint
- * @author Anton Kurako (GoodforGod)
  * @since 07.04.2022
  */
 final class DynamicProxyHintParser implements OptionParser {
@@ -34,59 +33,74 @@ public List<String> getInterfaces() {
         }
     }
 
+    private static final class DynamicProxy {
+
+        private final List<String> resources = new ArrayList<>();
+        private final List<String> files = new ArrayList<>();
+        private final List<Configuration> configurations = new ArrayList<>();
+    }
+
     @Override
     public List<Class<? extends Annotation>> getSupportedAnnotations() {
         return List.of(DynamicProxyHint.class);
     }
 
     @Override
-    public List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
+    public List<Option> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
         final Set<? extends Element> annotated = roundEnv.getElementsAnnotatedWith(DynamicProxyHint.class);
         final Set<TypeElement> elements = ElementFilter.typesIn(annotated);
         if (elements.isEmpty()) {
             return Collections.emptyList();
         }
 
-        final List<String> resources = elements.stream()
-                .map(element -> element.getAnnotation(DynamicProxyHint.class))
-                .flatMap(hint -> Arrays.stream(hint.resources()))
-                .collect(Collectors.toList());
-
-        final List<String> files = elements.stream()
-                .map(element -> element.getAnnotation(DynamicProxyHint.class))
-                .flatMap(hint -> Arrays.stream(hint.files()))
-                .collect(Collectors.toList());
-
-        final List<Configuration> configurations = elements.stream()
-                .map(this::getDynamicProxyConfigurations)
-                .flatMap(Collection::stream)
-                .filter(c -> !c.getInterfaces().isEmpty())
-                .collect(Collectors.toList());
-
-        if (!configurations.isEmpty()) {
-            final String proxyConfigurationFile = configurations.stream()
-                    .map(c -> c.getInterfaces().stream()
-                            .collect(Collectors.joining("\", \"", "  { \"interfaces\": [ \"", "\" ] }")))
-                    .collect(Collectors.joining(",\n", "[\n", "\n]"));
-
-            final HintOrigin origin = HintUtils.getHintOrigin(roundEnv, processingEnv);
-            final HintFile file = origin.getFileWithRelativePath("dynamic-proxy-config.json");
-            HintUtils.writeConfigFile(file, proxyConfigurationFile, processingEnv);
-            resources.add(file.getPath());
+        final Map<HintOrigin, DynamicProxy> proxies = new HashMap<>();
+        for (TypeElement element : elements) {
+            final List<String> resources = List.of(element.getAnnotation(DynamicProxyHint.class).resources());
+            final List<String> files = List.of(element.getAnnotation(DynamicProxyHint.class).files());
+            final List<Configuration> configurations = getDynamicProxyConfigurations(element).stream()
+                    .filter(c -> !c.getInterfaces().isEmpty())
+                    .collect(Collectors.toList());
+
+            if (!configurations.isEmpty() || !files.isEmpty() || !resources.isEmpty()) {
+                final HintOrigin origin = HintUtils.getHintOrigin(element, processingEnv);
+                final DynamicProxy proxy = proxies.computeIfAbsent(origin, k -> new DynamicProxy());
+                proxy.files.addAll(files);
+                proxy.resources.addAll(resources);
+                proxy.configurations.addAll(configurations);
+            }
         }
 
-        final List<String> options = new ArrayList<>();
-        if (!files.isEmpty()) {
-            final String proxyFileOption = files.stream()
-                    .collect(Collectors.joining(",", "-H:DynamicProxyConfigurationFiles=", ""));
-            options.add(proxyFileOption);
-        }
+        proxies.forEach((o, p) -> {
+            if (!p.configurations.isEmpty()) {
+                final String proxyConfigurationFile = p.configurations.stream()
+                        .map(c -> c.getInterfaces().stream()
+                                .collect(Collectors.joining("\", \"", "  { \"interfaces\": [ \"", "\" ] }")))
+                        .collect(Collectors.joining(",\n", "[\n", "\n]"));
+
+                final HintOrigin origin = HintUtils.getHintOrigin(elements.iterator().next(), processingEnv);
+                final HintFile file = origin.getFileWithRelativePath("dynamic-proxy-config.json");
+                HintUtils.writeConfigFile(file, proxyConfigurationFile, processingEnv);
+                p.resources.add(file.getPath());
+            }
+        });
+
+        final List<Option> options = new ArrayList<>();
+        proxies.forEach((o, p) -> {
+            final List<String> originOptions = new ArrayList<>();
+            if (!p.files.isEmpty()) {
+                final String proxyFileOption = p.files.stream()
+                        .collect(Collectors.joining(",", "-H:DynamicProxyConfigurationFiles=", ""));
+                originOptions.add(proxyFileOption);
+            }
 
-        if (!resources.isEmpty()) {
-            final String proxyResourceOption = resources.stream()
-                    .collect(Collectors.joining(",", "-H:DynamicProxyConfigurationResources=", ""));
-            options.add(proxyResourceOption);
-        }
+            if (!p.resources.isEmpty()) {
+                final String proxyResourceOption = p.resources.stream()
+                        .collect(Collectors.joining(",", "-H:DynamicProxyConfigurationResources=", ""));
+                originOptions.add(proxyResourceOption);
+            }
+
+            options.add(new Option(o, originOptions));
+        });
 
         return options;
     }
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintOrigin.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintOrigin.java
index a15fc62..1bd9d64 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintOrigin.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintOrigin.java
@@ -1,5 +1,7 @@
 package io.goodforgod.graalvm.hint.processor;
 
+import java.util.Objects;
+
 /**
  * Hint origin package and artifact where all configs will be generated
  *
@@ -12,7 +14,6 @@ final class HintOrigin {
     public static final String HINT_PROCESSING_ARTIFACT = "graalvm.hint.artifact";
 
     static final String DEFAULT_PACKAGE = "io.graalvm.hint";
-    static final String DEFAULT_ARTIFACT = "hint";
 
     /**
      * Artifact group of project
@@ -30,11 +31,30 @@ final class HintOrigin {
     }
 
     public HintFile getFileWithRelativePath(String fileName) {
-        return new HintFile(fileName, "META-INF/native-image/" + group + "/" + artifact);
+        return (artifact == null)
+                ? new HintFile(fileName, "META-INF/native-image/" + group)
+                : new HintFile(fileName, "META-INF/native-image/" + group + "/" + artifact);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        HintOrigin that = (HintOrigin) o;
+        return Objects.equals(group, that.group) && Objects.equals(artifact, that.artifact);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(group, artifact);
     }
 
     @Override
     public String toString() {
-        return "[group=" + group + ", artifact=" + artifact + ']';
+        return (artifact == null)
+                ? "[group=" + group + ']'
+                : "[group=" + group + ", artifact=" + artifact + ']';
     }
 }
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintUtils.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintUtils.java
index aec8363..fb3354c 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintUtils.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/HintUtils.java
@@ -22,18 +22,15 @@ final class HintUtils {
 
     private HintUtils() {}
 
-    static HintOrigin getHintOrigin(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
+    static HintOrigin getHintOrigin(Element element, ProcessingEnvironment processingEnv) {
         final Map<String, String> options = processingEnv.getOptions();
-        final Set<? extends Element> rootElements = roundEnv.getRootElements();
-        final Element anyElement = rootElements.iterator().next();
-
         final String group = (options.containsKey(HintOrigin.HINT_PROCESSING_GROUP))
                 ? options.get(HintOrigin.HINT_PROCESSING_GROUP)
-                : getPackage(processingEnv, anyElement);
+                : getPackage(processingEnv, element);
 
         final String artifact = (options.containsKey(HintOrigin.HINT_PROCESSING_ARTIFACT))
                 ? options.get(HintOrigin.HINT_PROCESSING_ARTIFACT)
-                : getArtifact(anyElement);
+                : getArtifact(element);
 
         return new HintOrigin(group, artifact);
     }
@@ -165,6 +162,6 @@ private static String getPackage(ProcessingEnvironment processingEnv, Element el
     }
 
     private static String getArtifact(Element element) {
-        return HintOrigin.DEFAULT_ARTIFACT;
+        return null;
     }
 }
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/InitializationHintParser.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/InitializationHintParser.java
index f67b16d..8c28b98 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/InitializationHintParser.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/InitializationHintParser.java
@@ -62,37 +62,49 @@ public List<Class<? extends Annotation>> getSupportedAnnotations() {
     }
 
     @Override
-    public List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
-        final Set<TypeElement> elements = HintUtils.getAnnotatedElements(roundEnv, InitializationHint.class,
-                InitializationHints.class);
+    public List<Option> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
+        final Set<TypeElement> elements = HintUtils.getAnnotatedElements(roundEnv,
+                InitializationHint.class, InitializationHints.class);
         if (elements.isEmpty()) {
             return Collections.emptyList();
         }
 
-        final Map<InitPhase, List<Initialization>> groupedInitializationOptions = elements.stream()
-                .flatMap(e -> {
-                    final InitializationHints hints = e.getAnnotation(InitializationHints.class);
-                    if (hints == null) {
-                        final InitializationHint hint = e.getAnnotation(InitializationHint.class);
-                        return getAnnotationPhases(e, hint).stream();
-                    } else {
-                        return getParentAnnotationPhases(e, InitializationHint.class, InitializationHints.class).stream();
-                    }
+        final Map<HintOrigin, List<Initialization>> inits = new HashMap<>();
+        for (TypeElement element : elements) {
+            final List<Initialization> initializations;
+
+            final InitializationHints hints = element.getAnnotation(InitializationHints.class);
+            if (hints == null) {
+                final InitializationHint hint = element.getAnnotation(InitializationHint.class);
+                initializations = getAnnotationPhases(element, hint);
+            } else {
+                initializations = getParentAnnotationPhases(element, InitializationHint.class, InitializationHints.class);
+            }
+
+            final HintOrigin origin = HintUtils.getHintOrigin(element, processingEnv);
+            final List<Initialization> value = inits.computeIfAbsent(origin, k -> new ArrayList<>());
+            value.addAll(initializations);
+        }
+
+        return inits.entrySet().stream()
+                .map(e -> {
+                    final Map<InitPhase, List<Initialization>> grouped = e.getValue().stream()
+                            .collect(Collectors.groupingBy(i -> i.phase));
+                    final List<String> options = grouped.entrySet().stream()
+                            .map(entry -> entry.getValue().stream()
+                                    .sorted()
+                                    .map(i -> i.className)
+                                    .collect(Collectors.joining(",", getInitializationArgumentName(entry.getKey()), "")))
+                            .sorted()
+                            .collect(Collectors.toList());
+
+                    return new Option(e.getKey(), options);
                 })
-                .distinct()
-                .collect(Collectors.groupingBy(e -> e.phase));
-
-        return groupedInitializationOptions.entrySet().stream()
-                .map(e -> e.getValue().stream()
-                        .sorted()
-                        .map(i -> i.className)
-                        .collect(Collectors.joining(",", getInitializationArgumentName(e.getKey()), "")))
-                .sorted()
                 .collect(Collectors.toList());
     }
 
-    private static Collection<Initialization> getAnnotationPhases(TypeElement element,
-                                                                  InitializationHint hint) {
+    private static List<Initialization> getAnnotationPhases(TypeElement element,
+                                                            InitializationHint hint) {
         final InitializationHint.InitPhase phase = hint.value();
         final List<String> typeNames = Arrays.asList(hint.typeNames());
         final List<String> types = HintUtils.getAnnotationFieldClassNames(element, InitializationHint.class, "types");
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/JniHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/JniHintProcessor.java
index dcb599c..d466871 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/JniHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/JniHintProcessor.java
@@ -34,7 +34,7 @@ protected String getFileName() {
     }
 
     @Override
-    protected Collection<Access> getGraalAccessForAnnotatedElement(TypeElement element) {
+    protected List<Access> getAccessForElement(TypeElement element) {
         final JniHints hints = element.getAnnotation(JniHints.class);
         if (hints == null) {
             final JniHint hint = element.getAnnotation(JniHint.class);
@@ -44,8 +44,8 @@ protected Collection<Access> getGraalAccessForAnnotatedElement(TypeElement eleme
         }
     }
 
-    private static Collection<Access> getAnnotationAccesses(TypeElement element,
-                                                            JniHint hint) {
+    private static List<Access> getAnnotationAccesses(TypeElement element,
+                                                      JniHint hint) {
         final ReflectionHint.AccessType[] accessTypes = convert(hint.value());
         final List<String> typeNames = Arrays.asList(hint.typeNames());
         final List<String> types = HintUtils.getAnnotationFieldClassNames(element, JniHint.class, "types");
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/LinkHintParser.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/LinkHintParser.java
index 9edf96a..fa662d1 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/LinkHintParser.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/LinkHintParser.java
@@ -2,10 +2,7 @@
 
 import io.goodforgod.graalvm.hint.annotation.LinkHint;
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -16,8 +13,8 @@
  * Processes {@link LinkHint} annotations for native-image.properties file
  *
  * @author Anton Kurako (GoodforGod)
- * @see LinkHint
  * @author Anton Kurako (GoodforGod)
+ * @see LinkHint
  * @since 02.05.2022
  */
 final class LinkHintParser implements OptionParser {
@@ -30,28 +27,41 @@ public List<Class<? extends Annotation>> getSupportedAnnotations() {
     }
 
     @Override
-    public List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
+    public List<Option> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
         final Set<TypeElement> elements = HintUtils.getAnnotatedElements(roundEnv, LinkHint.class);
         if (elements.isEmpty()) {
             return Collections.emptyList();
         }
 
-        final boolean linkAll = elements.stream().anyMatch(e -> e.getAnnotation(LinkHint.class).all());
-        if (linkAll) {
-            return List.of(LINK_BUILD_TIME);
+        final Optional<TypeElement> linkAll = elements.stream()
+                .filter(e -> e.getAnnotation(LinkHint.class).all())
+                .findFirst();
+        if (linkAll.isPresent()) {
+            final HintOrigin hintOrigin = HintUtils.getHintOrigin(linkAll.get(), processingEnv);
+            return List.of(new Option(hintOrigin, List.of(LINK_BUILD_TIME)));
         }
 
-        final List<String> types = elements.stream()
-                .flatMap(e -> {
-                    final LinkHint hint = e.getAnnotation(LinkHint.class);
-                    return getTypes(e, hint);
+        final Map<HintOrigin, List<String>> links = new HashMap<>();
+        for (TypeElement element : elements) {
+            final LinkHint hint = element.getAnnotation(LinkHint.class);
+            final List<String> hintTypes = getTypes(element, hint).collect(Collectors.toList());
+
+            if (!hintTypes.isEmpty()) {
+                final HintOrigin origin = HintUtils.getHintOrigin(element, processingEnv);
+                final List<String> options = links.computeIfAbsent(origin, k -> new ArrayList<>());
+                options.addAll(hintTypes);
+            }
+        }
+
+        return links.entrySet().stream()
+                .map(e -> {
+                    final String linkOption = e.getValue().stream()
+                            .distinct()
+                            .collect(Collectors.joining(",", LINK_BUILD_TIME + "=", ""));
+
+                    return new Option(e.getKey(), List.of(linkOption));
                 })
-                .distinct()
-                .sorted()
                 .collect(Collectors.toList());
-
-        return List.of(types.stream()
-                .collect(Collectors.joining(",", LINK_BUILD_TIME + "=", "")));
     }
 
     private Stream<String> getTypes(TypeElement element, LinkHint hint) {
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintParser.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintParser.java
index 3c80111..be2ebe4 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintParser.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintParser.java
@@ -16,8 +16,8 @@
  * Processes {@link NativeImageHint} annotations for native-image.properties file
  *
  * @author Anton Kurako (GoodforGod)
- * @see NativeImageHint
  * @author Anton Kurako (GoodforGod)
+ * @see NativeImageHint
  * @since 07.04.2022
  */
 final class NativeImageHintParser implements OptionParser {
@@ -28,10 +28,12 @@ private static class Entrypoint {
 
         private final String className;
         private final TypeElement source;
+        private final HintOrigin origin;
 
-        private Entrypoint(String className, TypeElement source) {
+        private Entrypoint(String className, TypeElement source, HintOrigin origin) {
             this.className = className;
             this.source = source;
+            this.origin = origin;
         }
 
         NativeImageHint hint() {
@@ -50,7 +52,7 @@ public List<Class<? extends Annotation>> getSupportedAnnotations() {
     }
 
     @Override
-    public List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
+    public List<Option> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv) {
         final Set<? extends Element> annotatedNative = roundEnv.getElementsAnnotatedWith(NativeImageHint.class);
         final Set<TypeElement> elements = ElementFilter.typesIn(annotatedNative);
         if (elements.isEmpty()) {
@@ -60,32 +62,38 @@ public List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment
         final List<Entrypoint> entrypoints = elements.stream()
                 .map(element -> HintUtils.getAnnotationFieldClassNameAny(element, NativeImageHint.class, "entrypoint")
                         .filter(name -> !ENTRY_POINT_DEFAULT_VALUE.equals(name))
-                        .map(name -> new Entrypoint(name, element))
+                        .map(name -> new Entrypoint(name, element, HintUtils.getHintOrigin(element, processingEnv)))
                         .orElse(null))
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
         if (entrypoints.size() > 1) {
-            throw new HintException("@NativeImageHint multiple entrypoints detected: " + entrypoints, entrypoints.get(1).source);
+            throw new HintException("@NativeImageHint multiple entrypoint detected: " + entrypoints, entrypoints.get(1).source);
         }
 
-        final Optional<Entrypoint> entryClassName = entrypoints.stream().findFirst();
-        final List<String> options = elements.stream()
-                .map(element -> element.getAnnotation(NativeImageHint.class))
-                .flatMap(hint -> Stream
-                        .concat(Arrays.stream(hint.options()).map(NativeImageOptions::option), Arrays.stream(hint.optionNames()))
-                        .distinct())
-                .collect(Collectors.toList());
+        final Map<HintOrigin, List<String>> options = new HashMap<>();
+        entrypoints.stream().findFirst().ifPresent(entrypoint -> {
+            final List<String> entryOptions = getEntrypointOptions(entrypoint);
+            options.put(entrypoint.origin, new ArrayList<>(entryOptions));
+        });
+
+        for (TypeElement element : elements) {
+            final NativeImageHint hint = element.getAnnotation(NativeImageHint.class);
+            final List<String> hintOptions = Stream
+                    .concat(Arrays.stream(hint.options()).map(NativeImageOptions::option), Arrays.stream(hint.optionNames()))
+                    .distinct()
+                    .collect(Collectors.toList());
 
-        return entryClassName
-                .map(entry -> {
-                    final List<String> entryOptions = getEntrypointOptions(entry);
-                    return Stream.of(entryOptions, options)
-                            .flatMap(Collection::stream)
-                            .distinct()
-                            .collect(Collectors.toList());
-                })
-                .orElse(options);
+            if (!hintOptions.isEmpty()) {
+                final HintOrigin origin = HintUtils.getHintOrigin(element, processingEnv);
+                final List<String> resultOptions = options.computeIfAbsent(origin, k -> new ArrayList<>());
+                resultOptions.addAll(hintOptions);
+            }
+        }
+
+        return options.entrySet().stream()
+                .map(e -> new Option(e.getKey(), e.getValue()))
+                .collect(Collectors.toList());
     }
 
     private List<String> getEntrypointOptions(Entrypoint entrypoint) {
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessor.java
index e6feb63..2dedfab 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessor.java
@@ -47,8 +47,17 @@ public boolean process(Set<? extends TypeElement> annotatedElements, RoundEnviro
         }
 
         try {
-            final List<String> options = OPTION_PARSERS.stream()
+            final List<Option> options = OPTION_PARSERS.stream()
                     .flatMap(parser -> parser.getOptions(roundEnv, processingEnv).stream())
+                    .collect(Collectors.groupingBy(Option::getOrigin))
+                    .entrySet().stream()
+                    .map(e -> {
+                        final List<String> mergedOptions = e.getValue().stream()
+                                .flatMap(v -> v.getOptions().stream())
+                                .distinct()
+                                .collect(Collectors.toList());
+                        return new Option(e.getKey(), mergedOptions);
+                    })
                     .collect(Collectors.toList());
 
             if (options.isEmpty()) {
@@ -62,12 +71,17 @@ public boolean process(Set<? extends TypeElement> annotatedElements, RoundEnviro
                         annotations + " are present but no options retrieved");
                 return false;
             } else {
-                final String nativeImageProperties = options.stream()
-                        .collect(Collectors.joining(ARG_SEPARATOR, "Args = ", ""));
+                for (Option option : options) {
+                    final String nativeImageProperties = option.getOptions().stream()
+                            .collect(Collectors.joining(ARG_SEPARATOR, "Args = ", ""));
 
-                final HintOrigin origin = HintUtils.getHintOrigin(roundEnv, processingEnv);
-                final HintFile file = origin.getFileWithRelativePath(FILE_NAME);
-                return HintUtils.writeConfigFile(file, nativeImageProperties, processingEnv);
+                    final HintFile file = option.getOrigin().getFileWithRelativePath(FILE_NAME);
+                    if (!HintUtils.writeConfigFile(file, nativeImageProperties, processingEnv)) {
+                        return false;
+                    }
+                }
+
+                return true;
             }
         } catch (HintException e) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage(), e.getElement());
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/Option.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/Option.java
new file mode 100644
index 0000000..3ff49d6
--- /dev/null
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/Option.java
@@ -0,0 +1,48 @@
+package io.goodforgod.graalvm.hint.processor;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Anton Kurako (GoodforGod)
+ *
+ * @since 20.02.2024
+ */
+final class Option {
+
+    private final HintOrigin origin;
+    private final List<String> options;
+
+    public Option(HintOrigin origin, List<String> options) {
+        this.origin = origin;
+        this.options = options;
+    }
+
+    public HintOrigin getOrigin() {
+        return origin;
+    }
+
+    public List<String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Option option = (Option) o;
+        return Objects.equals(origin, option.origin) && Objects.equals(options, option.options);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(origin, options);
+    }
+
+    @Override
+    public String toString() {
+        return "[path=" + origin + ", options=" + options + ']';
+    }
+}
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/OptionParser.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/OptionParser.java
index 4169b98..ae58768 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/OptionParser.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/OptionParser.java
@@ -24,5 +24,5 @@ interface OptionParser {
      * @param processingEnv parser invoked in
      * @return list of {@link NativeImageHint#optionNames()} to include
      */
-    List<String> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv);
+    List<Option> getOptions(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv);
 }
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessor.java
index e660453..38d63f2 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessor.java
@@ -5,7 +5,6 @@
 import io.goodforgod.graalvm.hint.annotation.ReflectionHints;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -33,7 +32,7 @@ protected String getFileName() {
     }
 
     @Override
-    protected Collection<Access> getGraalAccessForAnnotatedElement(TypeElement element) {
+    protected List<Access> getAccessForElement(TypeElement element) {
         final ReflectionHints hints = element.getAnnotation(ReflectionHints.class);
         if (hints == null) {
             final ReflectionHint hint = element.getAnnotation(ReflectionHint.class);
@@ -43,8 +42,8 @@ protected Collection<Access> getGraalAccessForAnnotatedElement(TypeElement eleme
         }
     }
 
-    private static Collection<Access> getAnnotationAccesses(TypeElement element,
-                                                            ReflectionHint hint) {
+    private static List<Access> getAnnotationAccesses(TypeElement element,
+                                                      ReflectionHint hint) {
         final AccessType[] accessTypes = hint.value();
         final List<String> typeNames = Arrays.asList(hint.typeNames());
         final List<String> types = HintUtils.getAnnotationFieldClassNames(element, ReflectionHint.class, "types");
diff --git a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessor.java b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessor.java
index ea966cd..bd8fbb9 100644
--- a/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessor.java
+++ b/graalvm-hint-processor/src/main/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessor.java
@@ -23,9 +23,9 @@ public final class ResourceHintProcessor extends AbstractHintProcessor {
 
     private static class Resources {
 
-        private final Set<String> includes = new HashSet<>();
-        private final Set<String> excludes = new HashSet<>();
-        private final Set<String> bundles = new HashSet<>();
+        private final Set<String> includes = new LinkedHashSet<>();
+        private final Set<String> excludes = new LinkedHashSet<>();
+        private final Set<String> bundles = new LinkedHashSet<>();
 
         boolean haveIncludes() {
             return !includes.isEmpty();
@@ -55,11 +55,25 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             final Set<? extends Element> annotated = roundEnv.getElementsAnnotatedWith(ResourceHint.class);
             final Set<TypeElement> elements = ElementFilter.typesIn(annotated);
 
-            final String resourceConfigJson = getResourceConfig(elements);
+            final Map<HintOrigin, Resources> resourcesMap = new HashMap<>();
+            for (TypeElement element : elements) {
+                final HintOrigin origin = HintUtils.getHintOrigin(element, processingEnv);
+                final Resources resources = resourcesMap.computeIfAbsent(origin, k -> new Resources());
+                final Resources resourceForElement = getResource(element);
+                resources.includes.addAll(resourceForElement.includes);
+                resources.excludes.addAll(resourceForElement.excludes);
+                resources.bundles.addAll(resourceForElement.bundles);
+            }
+
+            for (var entry : resourcesMap.entrySet()) {
+                final String resourceConfigJson = getResourceConfig(entry.getValue());
+                final HintFile file = entry.getKey().getFileWithRelativePath(FILE_NAME);
+                if (!HintUtils.writeConfigFile(file, resourceConfigJson, processingEnv)) {
+                    return false;
+                }
+            }
 
-            final HintOrigin origin = HintUtils.getHintOrigin(roundEnv, processingEnv);
-            final HintFile file = origin.getFileWithRelativePath(FILE_NAME);
-            return HintUtils.writeConfigFile(file, resourceConfigJson, processingEnv);
+            return true;
         } catch (HintException e) {
             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage(), e.getElement());
             return false;
@@ -70,8 +84,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         }
     }
 
-    private static String getResourceConfig(Set<TypeElement> elements) {
-        final Resources resources = getResources(elements);
+    private static String getResourceConfig(Resources resources) {
         final StringBuilder configBuilder = new StringBuilder();
         configBuilder.append("{");
         if (resources.haveIncludes() || resources.haveExcludes()) {
@@ -122,24 +135,22 @@ private static String getBundleConfigPart(Collection<String> bundles) {
                 .collect(Collectors.joining(",\n", "  \"bundles\": [\n", "\n  ]"));
     }
 
-    private static Resources getResources(Set<TypeElement> elements) {
+    private static Resources getResource(TypeElement element) {
         final Resources resources = new Resources();
-        for (TypeElement element : elements) {
-            final ResourceHint annotation = element.getAnnotation(ResourceHint.class);
-            final List<String> includeBatch = filterValues(annotation.include());
-            final List<String> excludeBatch = filterValues(annotation.exclude());
-            final List<String> bundleBatch = filterValues(annotation.bundles());
-            if (includeBatch.isEmpty() && excludeBatch.isEmpty() && bundleBatch.isEmpty()) {
-                throw new HintException(element.getQualifiedName().toString() + " is annotated with @"
-                        + ResourceHint.class.getSimpleName()
-                        + ", but no valid 'include' or 'exclude' or 'bundle' parameters specified!", element);
-            }
-
-            resources.includes.addAll(includeBatch);
-            resources.excludes.addAll(excludeBatch);
-            resources.bundles.addAll(bundleBatch);
+        final ResourceHint annotation = element.getAnnotation(ResourceHint.class);
+        final List<String> includeBatch = filterValues(annotation.include());
+        final List<String> excludeBatch = filterValues(annotation.exclude());
+        final List<String> bundleBatch = filterValues(annotation.bundles());
+        if (includeBatch.isEmpty() && excludeBatch.isEmpty() && bundleBatch.isEmpty()) {
+            throw new HintException(element.getQualifiedName().toString() + " is annotated with @"
+                    + ResourceHint.class.getSimpleName()
+                    + ", but no valid 'include' or 'exclude' or 'bundle' parameters specified!", element);
         }
 
+        resources.includes.addAll(includeBatch);
+        resources.excludes.addAll(excludeBatch);
+        resources.bundles.addAll(bundleBatch);
+
         return resources;
     }
 
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintProcessorTests.java
index 42c884a..e9bd388 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/DynamicProxyHintProcessorTests.java
@@ -23,13 +23,13 @@ void selfHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/native-image-config.properties"));
 
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/dynamic-proxy-hint-self.json"));
     }
@@ -52,13 +52,13 @@ void configHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/native-image-config.properties"));
 
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/dynamic-proxy-hint-config.json"));
     }
@@ -72,7 +72,7 @@ void resourceHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/native-image-resource.properties"));
     }
@@ -86,13 +86,13 @@ void resourceAndConfigHintSingleFile() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/native-image-resource-and-config.properties"));
 
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/dynamic-proxy-hint-resource-and-config.json"));
     }
@@ -107,13 +107,13 @@ void resourceAndConfigHintSeparateFiles() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/native-image-resource-and-config.properties"));
 
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("dynamicproxyhint/generated/dynamic-proxy-hint-resource-and-config.json"));
     }
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/InitializationHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/InitializationHintProcessorTests.java
index 9385a6f..d7447ab 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/InitializationHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/InitializationHintProcessorTests.java
@@ -23,7 +23,7 @@ void selfConfig() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("initializationhint/generated/native-image-self.properties"));
     }
@@ -37,7 +37,7 @@ void initializationHintBuildAndRuntime() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("initializationhint/generated/native-image-build-runtime.properties"));
     }
@@ -51,7 +51,7 @@ void initializationHintBuild() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("initializationhint/generated/native-image-build.properties"));
     }
@@ -65,7 +65,7 @@ void initializationHintEntrypointAndBuildAndRuntime() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString(
                         "initializationhint/generated/native-image-entrypoint-build-runtime.properties"));
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/JniHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/JniHintProcessorTests.java
index 70e0539..a21e316 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/JniHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/JniHintProcessorTests.java
@@ -23,7 +23,7 @@ void jniHintSelf() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/jni-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/jni-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("jnihint/generated/jni-config-only.json"));
     }
@@ -37,7 +37,7 @@ void jniHintForMultipleAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/jni-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/jni-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("jnihint/generated/jni-config.json"));
     }
@@ -52,7 +52,7 @@ void jniHintForMultipleClassesAndMultipleAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/jni-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/jni-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("jnihint/generated/jni-config-many.json"));
     }
@@ -66,7 +66,7 @@ void jniHintForMultipleAccessHints() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/jni-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/jni-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("jnihint/generated/jni-config-only-many-access.json"));
     }
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/LinkHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/LinkHintProcessorTests.java
index d5135a6..84c955d 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/LinkHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/LinkHintProcessorTests.java
@@ -23,7 +23,7 @@ void selfConfig() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("linkhint/generated/native-image-self.properties"));
     }
@@ -37,7 +37,7 @@ void typeAndTypename() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("linkhint/generated/native-image-type-typename.properties"));
     }
@@ -51,7 +51,7 @@ void initializationHintBuild() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("linkhint/generated/native-image-type.properties"));
     }
@@ -65,7 +65,7 @@ void initializationHintEntrypointAndBuildAndRuntime() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString(
                         "linkhint/generated/native-image-entrypoint-link.properties"));
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessorTests.java
index cd53f2a..b5f414a 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/NativeImageHintProcessorTests.java
@@ -23,7 +23,7 @@ void nativeImageHintEntrypoint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("nativeimagehint/generated/native-image-only.properties"));
     }
@@ -38,8 +38,22 @@ void nativeImageHintMultipleClassesMultipleAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/native-image.properties")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("nativeimagehint/generated/native-image.properties"));
     }
+
+    @Test
+    void nativeImageHintOptionsOnly() {
+        final Compilation compilation = Compiler.javac()
+                .withProcessors(new NativeImageHintProcessor())
+                .compile(JavaFileObjects.forResource("nativeimagehint/source/EntrypointOptions.java"));
+
+        CompilationSubject.assertThat(compilation).succeeded();
+        CompilationSubject.assertThat(compilation)
+                .generatedFile(StandardLocation.CLASS_OUTPUT,
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/native-image.properties")
+                .contentsAsString(StandardCharsets.UTF_8)
+                .isEqualTo(getResourceContentAsString("nativeimagehint/generated/native-image-options.properties"));
+    }
 }
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessorTests.java
index 3e63408..334dd80 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ReflectionHintProcessorTests.java
@@ -23,7 +23,7 @@ void reflectionHintSelf() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-only.json"));
     }
@@ -37,7 +37,7 @@ void reflectionHintForMultipleAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config.json"));
     }
@@ -52,7 +52,7 @@ void reflectionHintForMultipleClassesAndMultipleAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-many.json"));
     }
@@ -68,7 +68,7 @@ void reflectionHintForMultipleClassesAndManyAnnotations() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-all.json"));
     }
@@ -82,7 +82,7 @@ void reflectionHintForMultipleAccessHints() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-only-many-access.json"));
     }
@@ -96,7 +96,7 @@ void reflectionHintForInnerClass() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-class.json"));
     }
@@ -110,7 +110,7 @@ void reflectionHintForInnerClassSelf() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-self.json"));
     }
@@ -124,7 +124,7 @@ void reflectionHintForInnerInnerClass() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-inner-class.json"));
     }
@@ -138,7 +138,7 @@ void reflectionHintForInnerInnerClassSelf() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/reflect-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-inner-self.json"));
     }
@@ -152,7 +152,7 @@ void reflectionHintForInnerClassUnnamed() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.graalvm.hint/hint/reflect-config.json")
+                        "META-INF/native-image/io.graalvm.hint/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-class-unnamed.json"));
     }
@@ -166,7 +166,7 @@ void reflectionHintForInnerClassSelfUnnamed() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.graalvm.hint/hint/reflect-config.json")
+                        "META-INF/native-image/io.graalvm.hint/reflect-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("reflectionhint/generated/reflect-config-inner-self-unnamed.json"));
     }
diff --git a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessorTests.java b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessorTests.java
index 6a04eb6..ea6ade5 100644
--- a/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessorTests.java
+++ b/graalvm-hint-processor/src/test/java/io/goodforgod/graalvm/hint/processor/ResourceHintProcessorTests.java
@@ -23,7 +23,7 @@ void includeHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-include.json"));
     }
@@ -37,7 +37,7 @@ void excludeHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-exclude.json"));
     }
@@ -51,7 +51,7 @@ void bundleHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-bundle.json"));
     }
@@ -75,7 +75,7 @@ void includeAndExcludeMultipleFilesHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-include-and-exclude.json"));
     }
@@ -90,7 +90,7 @@ void includeAndBundleMultipleFilesHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-include-and-bundle.json"));
     }
@@ -105,7 +105,7 @@ void excludeAndBundleMultipleFilesHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-exclude-and-bundle.json"));
     }
@@ -119,7 +119,7 @@ void includeAndExcludeAndBundleOneFileHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-all.json"));
     }
@@ -135,7 +135,7 @@ void includeAndExcludeAndBundleMultipleFilesHint() {
         CompilationSubject.assertThat(compilation).succeeded();
         CompilationSubject.assertThat(compilation)
                 .generatedFile(StandardLocation.CLASS_OUTPUT,
-                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/resource-config.json")
+                        "META-INF/native-image/io.goodforgod.graalvm.hint.processor/resource-config.json")
                 .contentsAsString(StandardCharsets.UTF_8)
                 .isEqualTo(getResourceContentAsString("resourcehint/generated/resource-config-all.json"));
     }
diff --git a/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-config.properties b/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-config.properties
index c58892b..856e026 100644
--- a/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-config.properties
+++ b/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-config.properties
@@ -1 +1 @@
-Args = -H:DynamicProxyConfigurationResources=META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json
+Args = -H:DynamicProxyConfigurationResources=META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json
diff --git a/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-resource-and-config.properties b/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-resource-and-config.properties
index 2b3b53a..5c3a50d 100644
--- a/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-resource-and-config.properties
+++ b/graalvm-hint-processor/src/test/resources/dynamicproxyhint/generated/native-image-resource-and-config.properties
@@ -1,2 +1,2 @@
 Args = -H:DynamicProxyConfigurationFiles=file1 \
-       -H:DynamicProxyConfigurationResources=res1,res2,META-INF/native-image/io.goodforgod.graalvm.hint.processor/hint/dynamic-proxy-config.json
+       -H:DynamicProxyConfigurationResources=res1,res2,META-INF/native-image/io.goodforgod.graalvm.hint.processor/dynamic-proxy-config.json
diff --git a/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-entrypoint-link.properties b/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-entrypoint-link.properties
index 9c29105..71324bb 100644
--- a/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-entrypoint-link.properties
+++ b/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-entrypoint-link.properties
@@ -1,3 +1,3 @@
 Args = -H:Class=io.goodforgod.graalvm.hint.processor.EntrypointAndLink -H:Name=myapp \
        -H:+PrintClassInitialization \
-       --link-at-build-time=io.goodforgod.graalvm.hint.processor.EntrypointAndLink,io.goodforgod.graalvm.hint.processor.HintOrigin
+       --link-at-build-time=io.goodforgod.graalvm.hint.processor.HintOrigin,io.goodforgod.graalvm.hint.processor.EntrypointAndLink
diff --git a/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-type-typename.properties b/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-type-typename.properties
index a8417a6..3b3ce3f 100644
--- a/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-type-typename.properties
+++ b/graalvm-hint-processor/src/test/resources/linkhint/generated/native-image-type-typename.properties
@@ -1 +1 @@
-Args = --link-at-build-time=io.goodforgod.graalvm.hint.processor,io.goodforgod.graalvm.hint.processor.HintOrigin
+Args = --link-at-build-time=io.goodforgod.graalvm.hint.processor.HintOrigin,io.goodforgod.graalvm.hint.processor
diff --git a/graalvm-hint-processor/src/test/resources/nativeimagehint/generated/native-image-options.properties b/graalvm-hint-processor/src/test/resources/nativeimagehint/generated/native-image-options.properties
new file mode 100644
index 0000000..9d055de
--- /dev/null
+++ b/graalvm-hint-processor/src/test/resources/nativeimagehint/generated/native-image-options.properties
@@ -0,0 +1 @@
+Args = -H:+InlineBeforeAnalysis
diff --git a/gradle.properties b/gradle.properties
index 922d66a..d8f362d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 groupId=io.goodforgod
 artifactRootId=graalvm-hint
-artifactVersion=1.1.1-SNAPSHOT
+artifactVersion=1.2.0-SNAPSHOT
 
 
 ##### GRADLE #####
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cb..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a363877..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail