diff --git a/__manifest__.json b/__manifest__.json
index 67792e9..10ce389 100644
--- a/__manifest__.json
+++ b/__manifest__.json
@@ -47,11 +47,6 @@
       "name": "Database",
       "sort": 1
     },
-    {
-      "key": "firewall",
-      "name": "FireWall",
-      "sort": 2
-    },
     {
       "key": "tool",
       "name": "Utility",
@@ -78,14 +73,48 @@
       "sort": 7
     },
     {
-      "key": "sso-provider",
-      "name": "SSO Provider",
+      "key": "sso",
+      "name": "SSO",
       "sort": 8
     },
     {
       "key": "network",
       "name": "Network",
       "sort": 9
+    },
+    {
+      "key": "cloud",
+      "name": "Cloud",
+      "sort": 10
+    },
+    {
+      "key": "storage",
+      "name": "Storage",
+      "sort": 11
+    },
+    {
+      "key": "monitoring",
+      "name": "Monitoring",
+      "sort": 12
+    },
+    {
+      "key": "web",
+      "name": "Web",
+      "sort": 13
+    },
+    {
+      "key": "security",
+      "name": "Security"
+    },
+    {
+      "key": "os",
+      "name": "OS",
+      "sort": 14
+    },
+    {
+      "key": "appstore",
+      "name": "AppStore",
+      "sort": 15
     }
   ],
   "version": "1.0.0",
diff --git a/accountcenter.json b/accountcenter.json
index 3b55f7b..7722676 100644
--- a/accountcenter.json
+++ b/accountcenter.json
@@ -11,6 +11,10 @@
         "path": "/root/dev/docker-apps/Authentik/AccountCenter"
     },
     "required": "true",
-    "tags": [],
+    "tags": [
+        "sso",
+        "security",
+        "monitoring"
+    ],
     "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/bifrost.json b/bifrost.json
index 1efa2f3..d55d0b8 100644
--- a/bifrost.json
+++ b/bifrost.json
@@ -46,7 +46,11 @@
     }
   ],
   "required": "true",
-  "tags": [],
+  "tags": [
+    "tool",
+    "database",
+    "os"
+  ],
   "version": "1.0.0",
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextcloud.json b/nextcloud.json
index 2dec72f..61897c1 100644
--- a/nextcloud.json
+++ b/nextcloud.json
@@ -9,6 +9,9 @@
   "installation": {
     "host_type": "local"
   },
-  "tags": [],
+  "tags": [
+    "storage",
+    "cloud"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextdns.json b/nextdns.json
index b7b94e1..14dd159 100644
--- a/nextdns.json
+++ b/nextdns.json
@@ -10,7 +10,9 @@
         "host_type": "remote",
         "host": "10.0.0.1"
     },
-    "tags": [],
+    "tags": [
+        "security"
+    ],
     "lastModified": 1746671214,
     "required": "true"
 }
\ No newline at end of file
diff --git a/nextfirewall.json b/nextfirewall.json
index 4339dce..c76d874 100644
--- a/nextfirewall.json
+++ b/nextfirewall.json
@@ -11,6 +11,9 @@
     "host": "10.0.0.1"
   },
   "required": "true",
-  "tags": [],
+  "tags": [
+    "security",
+    "network"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextnas.json b/nextnas.json
index 890b96c..78125cc 100644
--- a/nextnas.json
+++ b/nextnas.json
@@ -10,6 +10,8 @@
     "host_type": "local"
   },
   "required": "true",
-  "tags": [],
+  "tags": [
+    "storage"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextvpn.json b/nextvpn.json
index 0fa4d5b..acc6ab4 100644
--- a/nextvpn.json
+++ b/nextvpn.json
@@ -10,6 +10,9 @@
     "host_type": "local"
   },
   "required": "true",
-  "tags": [],
+  "tags": [
+    "vpn",
+    "network"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextweb.json b/nextweb.json
index c7587f4..d6a9fd8 100644
--- a/nextweb.json
+++ b/nextweb.json
@@ -11,6 +11,8 @@
   },
   "required": "true",
   "apps": [],
-  "tags": [],
+  "tags": [
+    "web"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file
diff --git a/nextzenos.json b/nextzenos.json
index 9049045..928d97e 100644
--- a/nextzenos.json
+++ b/nextzenos.json
@@ -12,6 +12,10 @@
     "path": "/var/lib/casaos"
   },
   "apps": [],
-  "tags": [],
+  "tags": [
+    "storage",
+    "os",
+    "appstore"
+  ],
   "lastModified": 1746671214
 }
\ No newline at end of file