diff --git a/core/src/main/java/io/kestra/core/models/annotations/PluginSubGroup.java b/core/src/main/java/io/kestra/core/models/annotations/PluginSubGroup.java
index c06a9fe8850..d6bfd57aec5 100644
--- a/core/src/main/java/io/kestra/core/models/annotations/PluginSubGroup.java
+++ b/core/src/main/java/io/kestra/core/models/annotations/PluginSubGroup.java
@@ -2,6 +2,7 @@
 
 import java.lang.annotation.*;
 
+import static io.kestra.core.models.annotations.PluginSubGroup.PluginCategory.MISC;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Documented
@@ -11,4 +12,19 @@
 public @interface PluginSubGroup {
     String title() default "";
     String description() default "";
+
+    PluginCategory[] categories() default { MISC };
+
+    enum PluginCategory {
+        DATABASE,
+        MESSAGING,
+        SCRIPT,
+        TRANSFORMATION,
+        FLOW,
+        BATCH,
+        ALERTING,
+        CLOUD,
+        STORAGE,
+        MISC
+    }
 }
diff --git a/core/src/main/java/io/kestra/core/tasks/debugs/package-info.java b/core/src/main/java/io/kestra/core/tasks/debugs/package-info.java
new file mode 100644
index 00000000000..62f0d0af37d
--- /dev/null
+++ b/core/src/main/java/io/kestra/core/tasks/debugs/package-info.java
@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = PluginSubGroup.PluginCategory.MISC)
+package io.kestra.core.tasks.debugs;
+
+import io.kestra.core.models.annotations.PluginSubGroup;
\ No newline at end of file
diff --git a/core/src/main/java/io/kestra/core/tasks/flows/package-info.java b/core/src/main/java/io/kestra/core/tasks/flows/package-info.java
new file mode 100644
index 00000000000..bd84c4b219e
--- /dev/null
+++ b/core/src/main/java/io/kestra/core/tasks/flows/package-info.java
@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = PluginSubGroup.PluginCategory.FLOW)
+package io.kestra.core.tasks.flows;
+
+import io.kestra.core.models.annotations.PluginSubGroup;
\ No newline at end of file
diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/package-info.java b/core/src/main/java/io/kestra/core/tasks/scripts/package-info.java
new file mode 100644
index 00000000000..ba14e14f680
--- /dev/null
+++ b/core/src/main/java/io/kestra/core/tasks/scripts/package-info.java
@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = PluginSubGroup.PluginCategory.SCRIPT)
+package io.kestra.core.tasks.scripts;
+
+import io.kestra.core.models.annotations.PluginSubGroup;
\ No newline at end of file
diff --git a/core/src/main/java/io/kestra/core/tasks/states/package-info.java b/core/src/main/java/io/kestra/core/tasks/states/package-info.java
new file mode 100644
index 00000000000..87dbf1ed55e
--- /dev/null
+++ b/core/src/main/java/io/kestra/core/tasks/states/package-info.java
@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = PluginSubGroup.PluginCategory.STORAGE)
+package io.kestra.core.tasks.states;
+
+import io.kestra.core.models.annotations.PluginSubGroup;
\ No newline at end of file
diff --git a/core/src/main/java/io/kestra/core/tasks/storages/package-info.java b/core/src/main/java/io/kestra/core/tasks/storages/package-info.java
new file mode 100644
index 00000000000..7b749072f83
--- /dev/null
+++ b/core/src/main/java/io/kestra/core/tasks/storages/package-info.java
@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = PluginSubGroup.PluginCategory.STORAGE)
+package io.kestra.core.tasks.storages;
+
+import io.kestra.core.models.annotations.PluginSubGroup;
\ No newline at end of file