diff --git a/codec-haproxy/src/main/resources/META-INF/native-image/io.netty.contrib/netty-codec-haproxy/reflect-config.json b/codec-haproxy/src/main/resources/META-INF/native-image/io.netty.contrib/netty-codec-haproxy/generated/handlers/reflect-config.json
similarity index 100%
rename from codec-haproxy/src/main/resources/META-INF/native-image/io.netty.contrib/netty-codec-haproxy/reflect-config.json
rename to codec-haproxy/src/main/resources/META-INF/native-image/io.netty.contrib/netty-codec-haproxy/generated/handlers/reflect-config.json
diff --git a/pom.xml b/pom.xml
index c2d8f0c..e312a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
   </developers>
 
   <properties>
-    <netty.version>5.0.0.Alpha5</netty.version>
+    <netty.version>5.0.0.Alpha6-SNAPSHOT</netty.version>
     <netty.build.version>29</netty.build.version>
     <project.scm.id>github</project.scm.id>
     <release.gpg.keyname />
@@ -135,6 +135,11 @@
           <!-- Ensure the whole stacktrace is preserved when an exception is thrown. See https://issues.apache.org/jira/browse/SUREFIRE-1457 -->
           <trimStackTrace>false</trimStackTrace>
           <argLine>${test.argLine}</argLine>
+          <systemPropertyVariables>
+            <!-- Used by ChannelHandlerMetadataUtil to create the recommended directory layout for native-image metadata -->
+            <nativeImage.handlerMetadataGroupId>${project.groupId}</nativeImage.handlerMetadataGroupId>
+            <nativeimage.handlerMetadataArtifactId>${project.artifactId}</nativeimage.handlerMetadataArtifactId>
+          </systemPropertyVariables>
         </configuration>
       </plugin>