diff --git a/jboss/container/openjdk/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/jboss/container/openjdk/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
index a6a96dcb..8b5b09c7 100644
--- a/jboss/container/openjdk/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
+++ b/jboss/container/openjdk/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
@@ -6,5 +6,5 @@
 # ==============================================================================
 
 function jvm_specific_diagnostics() {
-    echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary"
+    echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMTStatistics -verbose:gc"
 }
diff --git a/jboss/container/openjdk/jdk/8/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/jboss/container/openjdk/jdk/8/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
index c8502c86..31e1a452 100644
--- a/jboss/container/openjdk/jdk/8/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
+++ b/jboss/container/openjdk/jdk/8/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
@@ -6,5 +6,5 @@
 # ==============================================================================
 
 function jvm_specific_diagnostics() {
-    echo "-XX:NativeMemoryTracking=summary -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions"
+    echo "-XX:NativeMemoryTracking=summary -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMTStatistics -verbose:gc"
 }