diff --git a/apps.toml b/apps.toml
index a21b4f4fe..a180c5cd4 100644
--- a/apps.toml
+++ b/apps.toml
@@ -4732,6 +4732,54 @@ state = "working"
 subtags = [ "url_shortener" ]
 url = "https://github.com/YunoHost-Apps/yourls_ynh"
 
+[yunohost_appgenerator]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_appgenerator_ynh"
+
+[yunohost_appstore]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_appstore_ynh"
+
+[yunohost_demo]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_demo_ynh"
+
+[yunohost_diagnosis]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_diagnosis_ynh"
+
+[yunohost_dynette]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_dynette_ynh"
+
+[yunohost_landingpage]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_landingpage_ynh"
+
+[yunohost_myip]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_myip_ynh"
+
+[yunohost_webhooks]
+category = "system_tools"
+state = "working"
+subtags = [ "yunohost_infra" ]
+url = "https://github.com/YunoHost-Apps/yunohost_webhooks_ynh"
+
 [yunomonitor]
 added_date = 1674232499 # 2023/01/20
 antifeatures = [ "deprecated-software" ]
diff --git a/categories.toml b/categories.toml
index fa946225c..8b04d14e1 100644
--- a/categories.toml
+++ b/categories.toml
@@ -437,6 +437,12 @@ title.it = "Strumenti di sistema"
   title.fr = "Bases de données"
   title.it = "Database"
 
+  [system_tools.subtags.yunohost_infra]
+  title.en = "YunoHost infrastructure utilities"
+  title.eu = "YunoHost azpiegitura utilitateak"
+  title.fr = "Utilitaires de l'infrastructure YunoHost"
+  title.it = "Atilità dell'infrastruttura YunoHost"
+
 [iot]
 description.en = "Home automation, energy dashboard..."
 description.eu = "Domotika, automatizazioa, energiaren kudeaketa..."
diff --git a/graveyard.toml b/graveyard.toml
index d5f84f640..a89c22781 100644
--- a/graveyard.toml
+++ b/graveyard.toml
@@ -28,12 +28,6 @@ category = "system_tools"
 killed_date = 1703600553 # 2023/12/26
 url = "https://github.com/YunoHost-Apps/dockerui_ynh"
 
-[dynette]
-added_date = 1554588215 # 2019/04/07
-category = "wat"
-killed_date = 1703600553 # 2023/12/26
-url = "https://github.com/YunoHost-Apps/dynette_ynh"
-
 [ecko]
 added_date = 1636827596 # 2021/11/13
 category = "social_media"