diff --git a/README.md b/README.md
index 0b0f8550..7d69dfdd 100644
--- a/README.md
+++ b/README.md
@@ -67,3 +67,8 @@ App packagers should *not* manually set their apps' level. The levels of all the
 Applications with no recent activity and no active sign from maintainer may be flagged in `apps.toml` with the `package-not-maintained` antifeature tag to signify that the app is inactive and may slowly become outdated with respect to the upstream, or with respect to good packaging practices. It does **not** mean that the app is not working anymore.
 
 Feel free to contact the app group if you feel like taking over the maintenance of a currently unmaintained app!
+
+### `graveyard.toml`
+
+This file is for apps that are long-term not-working and unlikely to be ever revived
+
diff --git a/apps.toml b/apps.toml
index df71f305..aabd5e48 100644
--- a/apps.toml
+++ b/apps.toml
@@ -89,7 +89,6 @@ url = "https://github.com/YunoHost-Apps/airsonic_ynh"
 
 [akkoma]
 category = "social_media"
-level = 0
 potential_alternative_to = [ "X", "Mastodon", "Pleroma", "Firefish", "Misskey", "Gotosocial" ]
 state = "notworking"
 subtags = [ "microblogging" ]
@@ -119,13 +118,6 @@ potential_alternative_to = [ "Capitalism" ]
 state = "working"
 url = "https://github.com/YunoHost-Apps/anarchism_ynh"
 
-[anfora]
-antifeatures = [ "package-not-maintained" ]
-category = "social_media"
-state = "notworking"
-subtags = [ "pictures" ]
-url = "https://github.com/YunoHost-Apps/anfora_ynh"
-
 [archivebox]
 category = "small_utilities"
 level = 8
@@ -194,15 +186,6 @@ state = "working"
 subtags = [ "automation" ]
 url = "https://github.com/YunoHost-Apps/beehive_ynh"
 
-[bibliogram]
-antifeatures = [ "non-free-network", "deprecated-software" ]
-category = "social_media"
-level = 8
-potential_alternative_to = [ "Instagram" ]
-state = "notworking"
-subtags = [ "pictures" ]
-url = "https://github.com/YunoHost-Apps/bibliogram_ynh"
-
 [biboumi]
 category = "communication"
 level = 8
@@ -366,7 +349,6 @@ url = "https://github.com/YunoHost-Apps/chuwiki_ynh"
 
 [chyrplite]
 category = "publishing"
-level = 1
 state = "notworking"
 subtags = [ "website", "blog" ]
 url = "https://github.com/YunoHost-Apps/chyrplite_ynh"
@@ -422,7 +404,6 @@ url = "https://github.com/YunoHost-Apps/codimd_ynh"
 
 [coin]
 category = "productivity_and_management"
-level = 0
 state = "notworking"
 subtags = [ "business_and_ngos" ]
 url = "https://github.com/YunoHost-Apps/coin_ynh"
@@ -480,13 +461,6 @@ state = "working"
 subtags = [ "books" ]
 url = "https://github.com/YunoHost-Apps/cops_ynh"
 
-[coquelicot]
-antifeatures = [ "package-not-maintained" ]
-category = "small_utilities"
-revision = "a0501bfae124b43531ed2b853a9dad59854b099d"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/coquelicot_ynh"
-
 [coturn]
 category = "system_tools"
 level = 8
@@ -504,7 +478,6 @@ url = "https://github.com/YunoHost-Apps/couchdb_ynh"
 [couchpotato]
 antifeatures = [ "package-not-maintained" ]
 category = "multimedia"
-level = 0
 potential_alternative_to = [ "Netflix" ]
 state = "notworking"
 subtags = [ "download" ]
@@ -561,7 +534,6 @@ url = "https://github.com/YunoHost-Apps/dato_ynh"
 
 [decidim]
 category = "communication"
-level = 0
 potential_alternative_to = [ "Cap Collectif", "Fluicity" ]
 state = "notworking"
 url = "https://github.com/YunoHost-Apps/decidim_ynh"
@@ -574,13 +546,6 @@ state = "working"
 subtags = [ "download" ]
 url = "https://github.com/YunoHost-Apps/deluge_ynh"
 
-[democracyos]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-state = "notworking"
-subtags = [ "forum" ]
-url = "https://github.com/YunoHost-Apps/democracyos_ynh"
-
 [dendrite]
 antifeatures = [ "alpha-software" ]
 category = "communication"
@@ -706,12 +671,6 @@ state = "working"
 subtags = [ "programming" ]
 url = "https://github.com/YunoHost-Apps/django_example_ynh"
 
-[dockerui]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/dockerui_ynh"
-
 [documize]
 category = "publishing"
 level = 8
@@ -783,11 +742,6 @@ level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/duniter_ynh"
 
-[dynette]
-category = "wat"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/dynette_ynh"
-
 [easyappointments]
 category = "productivity_and_management"
 level = 8
@@ -796,13 +750,6 @@ state = "working"
 subtags = [ "business_and_ngos" ]
 url = "https://github.com/YunoHost-Apps/easyappointments_ynh"
 
-[ecko]
-category = "social_media"
-level = 0
-state = "notworking"
-subtags = [ "microblogging" ]
-url = "https://github.com/YunoHost-Apps/ecko_ynh"
-
 [elabftw]
 category = "productivity_and_management"
 level = 6
@@ -948,14 +895,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/facilmap_ynh"
 
-[fallback]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-level = 3
-state = "notworking"
-subtags = [ "backup" ]
-url = "https://github.com/YunoHost-Apps/fallback_ynh"
-
 [fastapi]
 category = "publishing"
 level = 7
@@ -1028,14 +967,6 @@ state = "working"
 subtags = [ "forum" ]
 url = "https://github.com/YunoHost-Apps/flarum_ynh"
 
-[flask]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-revision = "9d5cbd6ddc64b4f8a849df69b77a0259eaf204ce"
-state = "notworking"
-subtags = [ "skeleton" ]
-url = "https://github.com/YunoHost-Apps/flask_ynh"
-
 [flood]
 category = "multimedia"
 level = 8
@@ -1043,12 +974,6 @@ state = "working"
 subtags = [ "download" ]
 url = "https://github.com/YunoHost-Apps/flood_ynh"
 
-[flusio]
-category = "reading"
-state = "notworking"
-subtags = [ "rssreader" ]
-url = "https://github.com/YunoHost-Apps/flusio_ynh"
-
 [fluxbb]
 category = "communication"
 level = 8
@@ -1065,13 +990,6 @@ state = "working"
 subtags = [ "task" ]
 url = "https://github.com/YunoHost-Apps/focalboard_ynh"
 
-[foodsoft]
-antifeatures = [ "package-not-maintained" ]
-category = "productivity_and_management"
-state = "notworking"
-subtags = [ "business_and_ngos" ]
-url = "https://github.com/YunoHost-Apps/foodsoft_ynh"
-
 [forgejo]
 category = "dev"
 level = 8
@@ -1080,22 +998,6 @@ state = "working"
 subtags = [ "forge" ]
 url = "https://github.com/YunoHost-Apps/forgejo_ynh"
 
-[framaestro]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "6cb4b99091da1bcc562412a2a6c8da6d02791b30"
-state = "notworking"
-subtags = [ "meeting" ]
-url = "https://github.com/YunoHost-Apps/framaestro_ynh"
-
-[framaestro_hub]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "8588e7562c232925295c2eb22a2a518b990355bb"
-state = "notworking"
-subtags = [ "meeting" ]
-url = "https://github.com/YunoHost-Apps/framaestro_hub_ynh"
-
 [framaforms]
 category = "productivity_and_management"
 level = 6
@@ -1110,20 +1012,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/framagames_ynh"
 
-[freeboard]
-antifeatures = [ "package-not-maintained" ]
-category = "iot"
-revision = "337111cc7e1eff33972ae7ba39db0dbcdcdd70c0"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/freeboard_ynh"
-
-[freepbx]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "787a43cdb51eda15953a441d87ea83eb7648a561"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/freepbx_ynh"
-
 [freescout]
 antifeatures = [ "not-totally-free" ]
 category = "productivity_and_management"
@@ -1148,20 +1036,6 @@ state = "working"
 subtags = [ "microblogging" ]
 url = "https://github.com/YunoHost-Apps/friendica_ynh"
 
-[ftp_webapp]
-antifeatures = [ "package-not-maintained" ]
-category = "small_utilities"
-revision = "6936f420d0d3d471af225f18cf431f4b37ade327"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/ftp_support_webapp_ynh"
-
-[ftssolr]
-antifeatures = [ "package-not-maintained" ]
-category = "wat"
-revision = "4a35c3d58da6911b961aeed76d2da91e3e9dbdca"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/ftssolr_ynh"
-
 [funkwhale]
 category = "multimedia"
 level = 8
@@ -1214,12 +1088,6 @@ state = "working"
 subtags = [ "business_and_ngos" ]
 url = "https://github.com/YunoHost-Apps/garradin_ynh"
 
-[gekko]
-category = "wat"
-revision = "5633e59a1e15ef85c2cea9f9606d6222d75c3ee8"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/gekko_ynh"
-
 [gemserv]
 category = "communication"
 level = 8
@@ -1271,13 +1139,6 @@ state = "working"
 subtags = [ "forge" ]
 url = "https://github.com/YunoHost-Apps/gitlist_ynh"
 
-[gitrepositories]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-state = "notworking"
-subtags = [ "forge" ]
-url = "https://github.com/YunoHost-Apps/gitrepositories_ynh"
-
 [glitchsoc]
 category = "social_media"
 level = 7
@@ -1300,15 +1161,6 @@ state = "working"
 subtags = [ "task" ]
 url = "https://github.com/YunoHost-Apps/glpi_ynh"
 
-[gnusocial]
-antifeatures = [ "package-not-maintained" ]
-category = "social_media"
-potential_alternative_to = [ "X" ]
-revision = "523263efaa94b347f2ea27935f67d265e15f4d21"
-state = "notworking"
-subtags = [ "microblogging" ]
-url = "https://github.com/YunoHost-Apps/gnusocial_ynh"
-
 [gogs]
 category = "dev"
 level = 8
@@ -1317,20 +1169,6 @@ state = "working"
 subtags = [ "forge" ]
 url = "https://github.com/YunoHost-Apps/gogs_ynh"
 
-[gogswebhost]
-antifeatures = [ "package-not-maintained" ]
-category = "publishing"
-revision = "5118d3224dccfc6acc3f05d9d6715946e7032a9e"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/gogs_webhost_ynh"
-
-[gollum]
-category = "publishing"
-level = 0
-state = "notworking"
-subtags = [ "wiki" ]
-url = "https://github.com/YunoHost-Apps/gollum_ynh"
-
 [gossa]
 category = "small_utilities"
 level = 8
@@ -1569,12 +1407,6 @@ state = "working"
 subtags = [ "db", "monitoring" ]
 url = "https://github.com/YunoHost-Apps/influxdb_v2_ynh"
 
-[internetarchive]
-category = "wat"
-level = 0
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/internetarchive_ynh"
-
 [invidious]
 antifeatures = [ "non-free-network" ]
 category = "social_media"
@@ -1625,14 +1457,6 @@ state = "working"
 subtags = [ "chat" ]
 url = "https://github.com/YunoHost-Apps/jappix_ynh"
 
-[jappix_mini]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "230e99a3a35e165e095ea944acaa7bc5d34acb7c"
-state = "notworking"
-subtags = [ "chat" ]
-url = "https://github.com/YunoHost-Apps/jappix_mini_ynh"
-
 [jeedom]
 category = "iot"
 level = 8
@@ -1691,12 +1515,6 @@ state = "working"
 subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/joomla_ynh"
 
-[joplin]
-category = "office"
-state = "notworking"
-subtags = [ "text" ]
-url = "https://github.com/YunoHost-Apps/joplin_ynh"
-
 [jupyterlab]
 category = "dev"
 level = 6
@@ -1750,7 +1568,6 @@ url = "https://github.com/YunoHost-Apps/kiwix_ynh"
 
 [kodi]
 category = "multimedia"
-level = 0
 potential_alternative_to = [ "Plex", "QuickTime", "Windows Media Center", "Windows Media Player", "Netflix" ]
 state = "notworking"
 subtags = [ "mediacenter" ]
@@ -1801,14 +1618,6 @@ state = "working"
 subtags = [ "text" ]
 url = "https://github.com/YunoHost-Apps/laverna_ynh"
 
-[lbcalerte]
-antifeatures = [ "package-not-maintained" ]
-category = "small_utilities"
-level = 0
-revision = "a38a83fea289f77910fd98b34ea58eea5f5909db"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/lbcalerte_ynh"
-
 [leantime]
 category = "productivity_and_management"
 level = 6
@@ -1825,14 +1634,6 @@ state = "working"
 subtags = [ "rssreader" ]
 url = "https://github.com/YunoHost-Apps/leed_ynh"
 
-[lektor]
-antifeatures = [ "package-not-maintained" ]
-category = "publishing"
-revision = "80e1d6681ec4f5764cfa6ab8e90538eee763784a"
-state = "notworking"
-subtags = [ "website" ]
-url = "https://github.com/YunoHost-Apps/lektor_ynh"
-
 [lemmy]
 category = "social_media"
 level = 1
@@ -1872,7 +1673,6 @@ url = "https://github.com/YunoHost-Apps/libremdb_ynh"
 
 [librephotos]
 category = "multimedia"
-level = 0
 potential_alternative_to = [ "Google Photos" ]
 state = "notworking"
 subtags = [ "pictures" ]
@@ -2012,15 +1812,6 @@ state = "working"
 subtags = [ "pictures" ]
 url = "https://github.com/YunoHost-Apps/lychee_ynh"
 
-[mailman]
-antifeatures = [ "deprecated-software" ]
-category = "communication"
-level = 0
-potential_alternative_to = [ "Google Groups" ]
-state = "notworking"
-subtags = [ "email" ]
-url = "https://github.com/yunohost-apps/mailman_ynh"
-
 [mailman3]
 category = "communication"
 level = 6
@@ -2122,14 +1913,6 @@ state = "working"
 subtags = [ "chat" ]
 url = "https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh"
 
-[mediadrop]
-antifeatures = [ "package-not-maintained" ]
-category = "multimedia"
-level = 0
-state = "notworking"
-subtags = [ "mediacenter" ]
-url = "https://github.com/YunoHost-Apps/mediadrop_ynh"
-
 [mediawiki]
 category = "publishing"
 level = 7
@@ -2144,11 +1927,6 @@ state = "working"
 subtags = [ "programming" ]
 url = "https://github.com/YunoHost-Apps/meilisearch_ynh"
 
-[menu]
-category = "wat"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/menu_ynh"
-
 [metabase]
 category = "system_tools"
 level = 8
@@ -2219,14 +1997,6 @@ state = "working"
 subtags = [ "events" ]
 url = "https://github.com/YunoHost-Apps/mobilizon_ynh"
 
-[modernpaste]
-antifeatures = [ "package-not-maintained" ]
-category = "small_utilities"
-revision = "d5715d86bff4b126baea05820127bf2d29ed4c71"
-state = "notworking"
-subtags = [ "pastebin" ]
-url = "https://github.com/YunoHost-Apps/modernpaste_ynh"
-
 [moncycle]
 category = "small_utilities"
 level = 8
@@ -2247,14 +2017,6 @@ level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/monica_ynh"
 
-[monit]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-revision = "79c43fc8fb2e4ebb9950f2bbfc74fc96d6b41490"
-state = "notworking"
-subtags = [ "monitoring" ]
-url = "https://github.com/YunoHost-Apps/monit_ynh"
-
 [monitorix]
 category = "system_tools"
 level = 6
@@ -2298,13 +2060,6 @@ state = "working"
 subtags = [ "music" ]
 url = "https://github.com/YunoHost-Apps/mstream_ynh"
 
-[multi_webapp]
-antifeatures = [ "package-not-maintained", "paid-content" ]
-category = "publishing"
-state = "notworking"
-subtags = [ "website" ]
-url = "https://github.com/YunoHost-Apps/multi_webapp_ynh"
-
 [mumble-web]
 category = "communication"
 level = 8
@@ -2319,14 +2074,6 @@ state = "working"
 subtags = [ "meeting" ]
 url = "https://github.com/YunoHost-Apps/mumbleserver_ynh"
 
-[munin]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-revision = "b45d6d12af7fea8c6183f3c80003416cd36fec1a"
-state = "notworking"
-subtags = [ "monitoring" ]
-url = "https://github.com/YunoHost-Apps/munin_ynh"
-
 [my-mind]
 category = "office"
 level = 8
@@ -2405,13 +2152,6 @@ state = "working"
 subtags = [ "files", "calendar", "contacts" ]
 url = "https://github.com/YunoHost-Apps/nextcloud_ynh"
 
-[nexusoss]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-revision = "7b54ee3195c0dc87e1032ba5c94b21f30d84e72c"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/nexusoss_ynh"
-
 [nitter]
 antifeatures = [ "non-free-network" ]
 category = "social_media"
@@ -2461,13 +2201,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/ntfy_ynh"
 
-[ntopng]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-revision = "151c74065ac8d97ed6a1c1b8f4158f2a95e33ebb"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/ntopng_ynh"
-
 [nullboard]
 category = "productivity_and_management"
 level = 8
@@ -2555,13 +2288,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/osjs_ynh"
 
-[osmw]
-antifeatures = [ "package-not-maintained" ]
-category = "wat"
-revision = "e26d5f5b8e075ec9cd0c320445e5ea2e2bd9fd29"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/osmw_ynh"
-
 [osticket]
 category = "productivity_and_management"
 level = 8
@@ -2639,12 +2365,6 @@ state = "working"
 subtags = [ "files" ]
 url = "https://github.com/YunoHost-Apps/paperless-ngx_ynh"
 
-[peachpub]
-category = "communication"
-level = 7
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/peachpub_ynh"
-
 [peertube]
 category = "social_media"
 level = 6
@@ -2707,7 +2427,6 @@ url = "https://github.com/YunoHost-Apps/pgadmin_ynh"
 [photonix]
 antifeatures = [ "package-not-maintained" ]
 category = "multimedia"
-level = 0
 state = "notworking"
 subtags = [ "pictures" ]
 url = "https://github.com/YunoHost-Apps/photonix_ynh"
@@ -2790,12 +2509,6 @@ state = "working"
 subtags = [ "monitoring" ]
 url = "https://github.com/YunoHost-Apps/phpsysinfo_ynh"
 
-[pia]
-antifeatures = [ "package-not-maintained" ]
-category = "productivity_and_management"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/pia_ynh"
-
 [pico]
 category = "publishing"
 level = 8
@@ -2810,15 +2523,6 @@ state = "working"
 subtags = [ "network" ]
 url = "https://github.com/YunoHost-Apps/pihole_ynh"
 
-[piratebox]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-level = 1
-revision = "19029e995498660035302adf0ce337cc5296bd7b"
-state = "notworking"
-subtags = [ "network" ]
-url = "https://github.com/labriqueinternet/piratebox_ynh"
-
 [piwigo]
 category = "multimedia"
 level = 8
@@ -2865,13 +2569,6 @@ state = "working"
 subtags = [ "microblogging" ]
 url = "https://github.com/YunoHost-Apps/pleroma_ynh"
 
-[plonecms]
-antifeatures = [ "package-not-maintained" ]
-category = "publishing"
-state = "notworking"
-subtags = [ "website" ]
-url = "https://github.com/YunoHost-Apps/plonecms_ynh"
-
 [plume]
 category = "social_media"
 level = 8
@@ -2894,13 +2591,6 @@ state = "working"
 subtags = [ "wiki" ]
 url = "https://github.com/YunoHost-Apps/pmwiki_ynh"
 
-[portainer]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-level = 0
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/portainer_ynh"
-
 [prestashop]
 category = "publishing"
 level = 8
@@ -2953,7 +2643,6 @@ url = "https://github.com/YunoHost-Apps/prowlarr_ynh"
 
 [proxitok]
 category = "social_media"
-level = 7
 potential_alternative_to = [ "TikTok" ]
 state = "notworking"
 url = "https://github.com/YunoHost-Apps/proxitok_ynh"
@@ -2966,11 +2655,6 @@ state = "working"
 subtags = [ "files" ]
 url = "https://github.com/YunoHost-Apps/psitransfer_ynh"
 
-[pterodactyl]
-antifeatures = [ "package-not-maintained" ]
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/pterodactyl_ynh"
-
 [pufferpanel]
 category = "games"
 level = 6
@@ -3042,7 +2726,6 @@ url = "https://github.com/YunoHost-Apps/radarr_ynh"
 
 [radicale]
 category = "synchronization"
-level = 0
 state = "notworking"
 subtags = [ "calendar", "contacts" ]
 url = "https://github.com/YunoHost-Apps/radicale_ynh"
@@ -3077,14 +2760,6 @@ state = "working"
 subtags = [ "task" ]
 url = "https://github.com/YunoHost-Apps/redmine_ynh"
 
-[reel2bits]
-antifeatures = [ "package-not-maintained" ]
-category = "social_media"
-potential_alternative_to = [ "Soundcloud" ]
-state = "notworking"
-subtags = [ "music" ]
-url = "https://github.com/YunoHost-Apps/reel2bits_ynh"
-
 [reiverr]
 antifeatures = [ "alpha-software" ]
 category = "multimedia"
@@ -3094,12 +2769,6 @@ state = "working"
 subtags = [ "videos", "mediacenter" ]
 url = "https://github.com/YunoHost-Apps/reiverr_ynh"
 
-[remotestorage]
-antifeatures = [ "package-not-maintained" ]
-category = "small_utilities"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/remotestorage_ynh"
-
 [restic]
 category = "system_tools"
 level = 8
@@ -3120,14 +2789,6 @@ state = "working"
 subtags = [ "network" ]
 url = "https://github.com/YunoHost-Apps/reverseproxy_ynh"
 
-[roadiz]
-antifeatures = [ "package-not-maintained" ]
-category = "publishing"
-revision = "3b9a44709b298869dc3be8bdd0aae43fdd7c2b24"
-state = "notworking"
-subtags = [ "website" ]
-url = "https://github.com/YunoHost-Apps/roadiz_ynh"
-
 [rocketchat]
 antifeatures = [ "not-totally-free" ]
 category = "communication"
@@ -3148,7 +2809,6 @@ url = "https://github.com/YunoHost-Apps/roundcube_ynh"
 [rportd]
 antifeatures = [ "deprecated-software" ]
 category = "system_tools"
-level = 0
 state = "notworking"
 subtags = [ "monitoring" ]
 url = "https://github.com/YunoHost-Apps/rportd_ynh"
@@ -3184,13 +2844,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/samba_ynh"
 
-[sat]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "f3016f998faac2625252dc99918066affdec21cc"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/sat_ynh"
-
 [satdress]
 category = "productivity_and_management"
 level = 8
@@ -3269,26 +2922,12 @@ state = "working"
 subtags = [ "blog" ]
 url = "https://github.com/YunoHost-Apps/shaarli_ynh"
 
-[shadowsocks]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-state = "notworking"
-subtags = [ "network" ]
-url = "https://github.com/YunoHost-Apps/shadowsocks_ynh"
-
 [shellinabox]
 category = "system_tools"
 level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/shellinabox_ynh"
 
-[shinken]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-state = "notworking"
-subtags = [ "monitoring" ]
-url = "https://github.com/YunoHost-Apps/shinken_ynh"
-
 [shiori]
 category = "small_utilities"
 level = 8
@@ -3302,13 +2941,6 @@ state = "working"
 subtags = [ "url_shortener" ]
 url = "https://github.com/YunoHost-Apps/shlink_ynh"
 
-[shsd]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-state = "notworking"
-subtags = [ "monitoring" ]
-url = "https://github.com/YunoHost-Apps/shsd_ynh"
-
 [shuri]
 category = "small_utilities"
 level = 8
@@ -3316,22 +2948,6 @@ state = "working"
 subtags = [ "url_shortener" ]
 url = "https://github.com/YunoHost-Apps/shuri_ynh"
 
-[sickbeard]
-antifeatures = [ "package-not-maintained" ]
-category = "multimedia"
-revision = "c88fd173e9e632df5de1c7acac57c503d317addb"
-state = "notworking"
-subtags = [ "download" ]
-url = "https://github.com/YunoHost-Apps/sickbeard_ynh"
-
-[sickrage]
-antifeatures = [ "package-not-maintained" ]
-category = "multimedia"
-revision = "b3a136938ad02d98051fe2cda40a9a2a3d10c763"
-state = "notworking"
-subtags = [ "download" ]
-url = "https://github.com/YunoHost-Apps/sickrage_ynh"
-
 [signaturepdf]
 category = "small_utilities"
 level = 8
@@ -3436,14 +3052,6 @@ level = 0
 state = "working"
 url = "https://github.com/YunoHost-Apps/sonarr_ynh"
 
-[sonerezh]
-antifeatures = [ "package-not-maintained" ]
-category = "multimedia"
-revision = "487fcbbea0408fed899ddb4346b3278586f2ea30"
-state = "notworking"
-subtags = [ "music" ]
-url = "https://github.com/YunoHost-Apps/sonerezh_ynh"
-
 [spacedeck]
 category = "office"
 level = 6
@@ -3456,13 +3064,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/spftoolbox_ynh"
 
-[sphinx]
-antifeatures = [ "package-not-maintained" ]
-category = "publishing"
-revision = "dceabf72c018b382a01487489c32b89ea11d2b33"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/sphinx_ynh"
-
 [spip]
 category = "publishing"
 level = 8
@@ -3490,13 +3091,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/ssh_chroot_dir_ynh"
 
-[staticwebapp]
-antifeatures = [ "replaced-by-another-app" ]
-category = "publishing"
-revision = "ef924590f8fd5689d261c226d87d46a0e0a9521d"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/staticwebapp_ynh"
-
 [statpingng]
 category = "system_tools"
 level = 8
@@ -3526,13 +3120,6 @@ state = "working"
 subtags = [ "impress" ]
 url = "https://github.com/YunoHost-Apps/strut_ynh"
 
-[subscribe]
-antifeatures = [ "package-not-maintained" ]
-category = "wat"
-revision = "94d0f67aaebeff9542a0c89a5d4af395111f336e"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/subscribe_ynh"
-
 [sutom]
 category = "games"
 level = 8
@@ -3546,15 +3133,6 @@ state = "working"
 subtags = [ "draw" ]
 url = "https://github.com/YunoHost-Apps/svgedit_ynh"
 
-[sympa]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-potential_alternative_to = [ "Google Groups" ]
-revision = "9128bfa577781b0391925ef43eb99d8e01e40ef5"
-state = "notworking"
-subtags = [ "email" ]
-url = "https://github.com/YunoHost-Apps/sympa_ynh"
-
 [synapse]
 category = "communication"
 level = 8
@@ -3584,13 +3162,6 @@ state = "working"
 subtags = [ "files" ]
 url = "https://github.com/YunoHost-Apps/syncthing_ynh"
 
-[tagspaces]
-antifeatures = [ "package-not-maintained" ]
-category = "synchronization"
-revision = "22afa970550cf5f1d8c21c6a1fa52fa611ae918f"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/tagspaces_ynh"
-
 [tandoor]
 category = "small_utilities"
 level = 8
@@ -3628,25 +3199,12 @@ potential_alternative_to = [ "Reddit" ]
 state = "working"
 url = "https://github.com/YunoHost-Apps/teddit_ynh"
 
-[telegram_chatbot]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-revision = "fb4e8aeb0e4f34e17e7450084e4827eabfd4ce04"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/telegram_chatbot_ynh"
-
 [terraforming-mars]
 category = "games"
 level = 7
 state = "working"
 url = "https://github.com/YunoHost-Apps/terraforming-mars_ynh"
 
-[tes3mp]
-antifeatures = [ "package-not-maintained" ]
-category = "games"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/tes3mp_ynh"
-
 [thelounge]
 category = "communication"
 level = 8
@@ -3746,12 +3304,6 @@ state = "working"
 subtags = [ "download" ]
 url = "https://github.com/YunoHost-Apps/transmission_ynh"
 
-[transpay]
-antifeatures = [ "package-not-maintained" ]
-category = "productivity_and_management"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/transpay_ynh"
-
 [trilium]
 category = "office"
 level = 8
@@ -3790,13 +3342,6 @@ state = "working"
 subtags = [ "wiki" ]
 url = "https://github.com/YunoHost-Apps/turtl_ynh"
 
-[tutao]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "b47d807e509701a86803129f695a290dd9c75236"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/tutao_ynh"
-
 [tvheadend]
 category = "multimedia"
 level = 8
@@ -3824,14 +3369,6 @@ state = "working"
 subtags = [ "analytics" ]
 url = "https://github.com/YunoHost-Apps/umami_ynh"
 
-[umap]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-potential_alternative_to = [ "Google Maps" ]
-revision = "e569c56e76f79da3580bd3432406dd56225e814d"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/umap_ynh"
-
 [ums]
 category = "multimedia"
 level = 8
@@ -3844,13 +3381,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/unattended_upgrades_ynh"
 
-[unbound]
-antifeatures = [ "package-not-maintained" ]
-category = "system_tools"
-revision = "36336908cbca5a825d1b79d472e7620ca055b98e"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/unbound_ynh"
-
 [uptime-kuma]
 category = "system_tools"
 level = 8
@@ -3868,7 +3398,6 @@ url = "https://github.com/YunoHost-Apps/vaultwarden_ynh"
 
 [veloren]
 category = "games"
-level = 0
 potential_alternative_to = [ "Minecraft" ]
 state = "notworking"
 url = "https://github.com/YunoHost-Apps/veloren_ynh"
@@ -3895,14 +3424,6 @@ state = "working"
 subtags = [ "network" ]
 url = "https://github.com/labriqueinternet/vpnclient_ynh"
 
-[vpnserver]
-category = "system_tools"
-level = 0
-revision = "ccb123ec51373b5967079ff868bbe2e0327ee25c"
-state = "notworking"
-subtags = [ "network" ]
-url = "https://github.com/YunoHost-Apps/vpnserver_ynh"
-
 [wallabag2]
 category = "reading"
 level = 6
@@ -3922,14 +3443,6 @@ level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/webmin_ynh"
 
-[webogram]
-antifeatures = [ "package-not-maintained" ]
-category = "communication"
-revision = "1d7a5378279743e1acc88978777e0b7d76113bfa"
-state = "notworking"
-subtags = [ "chat" ]
-url = "https://github.com/YunoHost-Apps/webogram_ynh"
-
 [webtrees]
 category = "wat"
 level = 8
@@ -3970,12 +3483,6 @@ state = "working"
 subtags = [ "wiki" ]
 url = "https://github.com/YunoHost-Apps/wikijs_ynh"
 
-[wildfly]
-antifeatures = [ "package-not-maintained" ]
-category = "dev"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/wildfly_ynh"
-
 [wireguard]
 category = "system_tools"
 level = 8
@@ -3990,14 +3497,6 @@ state = "working"
 subtags = [ "network" ]
 url = "https://github.com/YunoHost-Apps/wireguard_client_ynh"
 
-[wisemapping]
-antifeatures = [ "package-not-maintained" ]
-category = "office"
-revision = "78b15c6e70a9ddd84aa12b9cf4e48ee619bdc75b"
-state = "notworking"
-subtags = [ "mindmap" ]
-url = "https://github.com/YunoHost-Apps/wisemapping_ynh"
-
 [wondercms]
 category = "publishing"
 level = 8
@@ -4078,22 +3577,6 @@ state = "working"
 subtags = [ "url_shortener" ]
 url = "https://github.com/YunoHost-Apps/yourls_ynh"
 
-[youtube-dl-webui]
-antifeatures = [ "package-not-maintained" ]
-category = "multimedia"
-level = 0
-revision = "c4ad37ea15ef00a4b1bddd8d9c38d4ecc53b301c"
-state = "notworking"
-subtags = [ "download" ]
-url = "https://github.com/YunoHost-Apps/youtube-dl-webui_ynh"
-
-[yunofav]
-antifeatures = [ "package-not-maintained" ]
-category = "wat"
-revision = "14e85b0e0ead5c34e69f8faa97b2ec10aa3cc68b"
-state = "notworking"
-url = "https://github.com/YunoHost-Apps/yunofav_ynh"
-
 [yunomonitor]
 category = "system_tools"
 level = 6
@@ -4103,7 +3586,6 @@ url = "https://github.com/YunoHost-Apps/yunomonitor_ynh"
 
 [yunorunner]
 category = "dev"
-level = 0
 state = "notworking"
 url = "https://github.com/YunoHost-Apps/yunorunner_ynh"
 
diff --git a/graveyard.toml b/graveyard.toml
new file mode 100644
index 00000000..f4b43d73
--- /dev/null
+++ b/graveyard.toml
@@ -0,0 +1,257 @@
+[anfora]
+category = "social_media"
+subtags = [ "pictures" ]
+url = "https://github.com/YunoHost-Apps/anfora_ynh"
+
+[bibliogram]
+category = "social_media"
+potential_alternative_to = [ "Instagram" ]
+subtags = [ "pictures" ]
+url = "https://github.com/YunoHost-Apps/bibliogram_ynh"
+
+[democracyos]
+category = "communication"
+subtags = [ "forum" ]
+url = "https://github.com/YunoHost-Apps/democracyos_ynh"
+
+[dockerui]
+category = "system_tools"
+url = "https://github.com/YunoHost-Apps/dockerui_ynh"
+
+[dynette]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/dynette_ynh"
+
+[ecko]
+category = "social_media"
+subtags = [ "microblogging" ]
+url = "https://github.com/YunoHost-Apps/ecko_ynh"
+
+[fallback]
+category = "system_tools"
+subtags = [ "backup" ]
+url = "https://github.com/YunoHost-Apps/fallback_ynh"
+
+[flask]
+category = "dev"
+subtags = [ "skeleton" ]
+url = "https://github.com/YunoHost-Apps/flask_ynh"
+
+[flusio]
+category = "reading"
+subtags = [ "rssreader" ]
+url = "https://github.com/YunoHost-Apps/flusio_ynh"
+
+[foodsoft]
+category = "productivity_and_management"
+subtags = [ "business_and_ngos" ]
+url = "https://github.com/YunoHost-Apps/foodsoft_ynh"
+
+[framaestro]
+category = "communication"
+subtags = [ "meeting" ]
+url = "https://github.com/YunoHost-Apps/framaestro_ynh"
+
+[framaestro_hub]
+category = "communication"
+subtags = [ "meeting" ]
+url = "https://github.com/YunoHost-Apps/framaestro_hub_ynh"
+
+[freeboard]
+category = "iot"
+url = "https://github.com/YunoHost-Apps/freeboard_ynh"
+
+[freepbx]
+category = "communication"
+url = "https://github.com/YunoHost-Apps/freepbx_ynh"
+
+[ftp_webapp]
+category = "small_utilities"
+url = "https://github.com/YunoHost-Apps/ftp_support_webapp_ynh"
+
+[ftssolr]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/ftssolr_ynh"
+
+[gekko]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/gekko_ynh"
+
+[gitrepositories]
+category = "dev"
+subtags = [ "forge" ]
+url = "https://github.com/YunoHost-Apps/gitrepositories_ynh"
+
+[gnusocial]
+category = "social_media"
+potential_alternative_to = [ "X" ]
+subtags = [ "microblogging" ]
+url = "https://github.com/YunoHost-Apps/gnusocial_ynh"
+
+[gogswebhost]
+category = "publishing"
+url = "https://github.com/YunoHost-Apps/gogs_webhost_ynh"
+
+[internetarchive]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/internetarchive_ynh"
+
+[jappix_mini]
+category = "communication"
+subtags = [ "chat" ]
+url = "https://github.com/YunoHost-Apps/jappix_mini_ynh"
+
+[lbcalerte]
+category = "small_utilities"
+url = "https://github.com/YunoHost-Apps/lbcalerte_ynh"
+
+[lektor]
+category = "publishing"
+subtags = [ "website" ]
+url = "https://github.com/YunoHost-Apps/lektor_ynh"
+
+[mailman]
+category = "communication"
+potential_alternative_to = [ "Google Groups" ]
+subtags = [ "email" ]
+url = "https://github.com/yunohost-apps/mailman_ynh"
+
+[mediadrop]
+category = "multimedia"
+subtags = [ "mediacenter" ]
+url = "https://github.com/YunoHost-Apps/mediadrop_ynh"
+
+[menu]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/menu_ynh"
+
+[modernpaste]
+category = "small_utilities"
+subtags = [ "pastebin" ]
+url = "https://github.com/YunoHost-Apps/modernpaste_ynh"
+
+[monit]
+category = "system_tools"
+subtags = [ "monitoring" ]
+url = "https://github.com/YunoHost-Apps/monit_ynh"
+
+[multi_webapp]
+category = "publishing"
+subtags = [ "website" ]
+url = "https://github.com/YunoHost-Apps/multi_webapp_ynh"
+
+[munin]
+category = "system_tools"
+subtags = [ "monitoring" ]
+url = "https://github.com/YunoHost-Apps/munin_ynh"
+
+[nexusoss]
+category = "dev"
+url = "https://github.com/YunoHost-Apps/nexusoss_ynh"
+
+[ntopng]
+category = "system_tools"
+url = "https://github.com/YunoHost-Apps/ntopng_ynh"
+
+[osmw]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/osmw_ynh"
+
+[peachpub]
+category = "communication"
+url = "https://github.com/YunoHost-Apps/peachpub_ynh"
+
+[piratebox]
+category = "system_tools"
+subtags = [ "network" ]
+url = "https://github.com/labriqueinternet/piratebox_ynh"
+
+[plonecms]
+category = "publishing"
+subtags = [ "website" ]
+url = "https://github.com/YunoHost-Apps/plonecms_ynh"
+
+[portainer]
+category = "system_tools"
+url = "https://github.com/YunoHost-Apps/portainer_ynh"
+
+[reel2bits]
+category = "social_media"
+potential_alternative_to = [ "Soundcloud" ]
+subtags = [ "music" ]
+url = "https://github.com/YunoHost-Apps/reel2bits_ynh"
+
+[remotestorage]
+category = "small_utilities"
+url = "https://github.com/YunoHost-Apps/remotestorage_ynh"
+
+[roadiz]
+category = "publishing"
+subtags = [ "website" ]
+url = "https://github.com/YunoHost-Apps/roadiz_ynh"
+
+[shsd]
+category = "system_tools"
+subtags = [ "monitoring" ]
+url = "https://github.com/YunoHost-Apps/shsd_ynh"
+
+[sickbeard]
+category = "multimedia"
+subtags = [ "download" ]
+url = "https://github.com/YunoHost-Apps/sickbeard_ynh"
+
+[sickrage]
+category = "multimedia"
+subtags = [ "download" ]
+url = "https://github.com/YunoHost-Apps/sickrage_ynh"
+
+[sonerezh]
+category = "multimedia"
+subtags = [ "music" ]
+url = "https://github.com/YunoHost-Apps/sonerezh_ynh"
+
+[staticwebapp]
+category = "publishing"
+url = "https://github.com/YunoHost-Apps/staticwebapp_ynh"
+
+[subscribe]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/subscribe_ynh"
+
+[tagspaces]
+category = "synchronization"
+url = "https://github.com/YunoHost-Apps/tagspaces_ynh"
+
+[telegram_chatbot]
+category = "dev"
+url = "https://github.com/YunoHost-Apps/telegram_chatbot_ynh"
+
+[tes3mp]
+category = "games"
+url = "https://github.com/YunoHost-Apps/tes3mp_ynh"
+
+[transpay]
+category = "productivity_and_management"
+url = "https://github.com/YunoHost-Apps/transpay_ynh"
+
+[unbound]
+category = "system_tools"
+url = "https://github.com/YunoHost-Apps/unbound_ynh"
+
+[vpnserver]
+category = "system_tools"
+subtags = [ "network" ]
+url = "https://github.com/YunoHost-Apps/vpnserver_ynh"
+
+[wildfly]
+category = "dev"
+url = "https://github.com/YunoHost-Apps/wildfly_ynh"
+
+[youtube-dl-webui]
+category = "multimedia"
+subtags = [ "download" ]
+url = "https://github.com/YunoHost-Apps/youtube-dl-webui_ynh"
+
+[yunofav]
+category = "wat"
+url = "https://github.com/YunoHost-Apps/yunofav_ynh"
diff --git a/tools/catalog_linter.py b/tools/catalog_linter.py
index 3c5453e1..4c383a97 100755
--- a/tools/catalog_linter.py
+++ b/tools/catalog_linter.py
@@ -37,6 +37,12 @@ def get_wishlist() -> Dict[str, Dict[str, str]]:
     return toml.load(wishlist_path)
 
 
+@cache
+def get_graveyard() -> Dict[str, Dict[str, str]]:
+    wishlist_path = APPS_ROOT / "graveyard.toml"
+    return toml.load(wishlist_path)
+
+
 def validate_schema() -> Generator[str, None, None]:
     with open(APPS_ROOT / "schemas" / "apps.toml.schema.json", encoding="utf-8") as file:
         apps_catalog_schema = json.load(file)
@@ -50,9 +56,6 @@ def check_app(app: str, infos: Dict[str, Any]) -> Generator[Tuple[str, bool], No
         yield "state is missing", True
         return
 
-    if infos["state"] != "working":
-        return
-
     # validate that the app is not (anymore?) in the wishlist
     # we use fuzzy matching because the id in catalog may not be the same exact id as in the wishlist
     # some entries are ignore-hard-coded, because e.g. radarr an readarr are really different apps...
@@ -66,6 +69,16 @@ def check_app(app: str, infos: Dict[str, Any]) -> Generator[Tuple[str, bool], No
     if wishlist_matches:
         yield f"app seems to be listed in wishlist: {wishlist_matches}", True
 
+    ignored_graveyard_entries = ["mailman"]
+    graveyard_matches = [
+        grave
+        for grave in get_graveyard()
+        if grave not in ignored_graveyard_entries
+        and SequenceMatcher(None, app, grave).ratio() > 0.9
+    ]
+    if graveyard_matches:
+        yield f"app seems to be listed in graveyard: {graveyard_matches}", True
+
     repo_name = infos.get("url", "").split("/")[-1]
     if repo_name != f"{app}_ynh":
         yield f"repo name should be {app}_ynh, not in {repo_name}", True
diff --git a/wishlist.toml b/wishlist.toml
index 9677a516..5fad742f 100644
--- a/wishlist.toml
+++ b/wishlist.toml
@@ -129,6 +129,7 @@ name = "Beatbump"
 description = "An alternative frontend for YouTube Music"
 upstream = "https://github.com/snuffyDev/Beatbump"
 website = "https://beatbump.ml/home"
+draft = "https://github.com/YunoHost-Apps/beatbump_ynh"
 
 [beeper]
 name = "Beeper"
@@ -297,6 +298,7 @@ name = "Coquelicot"
 description = "A “one-click” file sharing web application"
 upstream = ""
 website = "https://coquelicot.potager.org/"
+draft = "https://github.com/YunoHost-Apps/coquelicot_ynh"
 
 [counter]
 name = "Counter"
@@ -555,6 +557,7 @@ name = "Gollum"
 description = "A simple Git-powered wiki"
 upstream = "https://github.com/gollum/gollum"
 website = ""
+draft = "https://github.com/YunoHost-Apps/gollum_ynh"
 
 [granary]
 name = "Granary"
@@ -687,6 +690,14 @@ name = "IPFS"
 description = "Peer-to-peer hypermedia protocol"
 upstream = "https://github.com/ipfs/ipfs"
 website = "https://ipfs.io"
+draft = "https://github.com/YunoHost-Apps/ipfs_ynh"
+
+[joplin]
+name = "Joplin"
+description = "Note taking and to-do application with synchronisation capabilities for Windows, macOS, Linux, Android and iOS."
+upstream = "https://github.com/laurent22/joplin"
+website = "https://joplinapp.org/"
+draft = "https://github.com/YunoHost-Apps/joplin_ynh"
 
 [js-bin]
 name = "JS Bin"
@@ -717,6 +728,7 @@ name = "Kitchenowl"
 description = "Grocery list and recipe manager"
 upstream = "https://github.com/TomBursch/kitchenowl"
 website = "https://kitchenowl.org/"
+draft = "https://github.com/YunoHost-Apps/kitchenowl_ynh"
 
 [klaxon]
 name = "Klaxon"
@@ -885,12 +897,14 @@ name = "Mediagoblin"
 description = "Video streaming platform"
 upstream = "https://savannah.gnu.org/projects/mediagoblin"
 website = "https://mediagoblin.org/"
+draft = "https://github.com/YunoHost-Apps/mediagoblin_ynh"
 
 [medusa]
 name = "Medusa"
 description = "Automatic TV shows downloader"
 upstream = "https://github.com/pymedusa/Medusa"
 website = "https://pymedusa.com/"
+draft = "https://github.com/YunoHost-Apps/medusa_ynh"
 
 [megaglest]
 name = "Megaglest"
@@ -945,6 +959,7 @@ name = "MotionEye"
 description = "A web frontend for the motion daemon"
 upstream = "https://github.com/ccrisan/motioneye"
 website = ""
+draft = "https://github.com/YunoHost-Apps/motioneye_ynh"
 
 [nebula]
 name = "Nebula"
@@ -1089,6 +1104,7 @@ name = "Peppermint"
 description = "A central hub for your help desk. A powerfully easy system for tracking, prioritising, and solving customer support tickets"
 upstream = "https://github.com/Peppermint-Lab/peppermint"
 website = "https://peppermint.sh/"
+draft = "https://github.com/YunoHost-Apps/peppermint_ynh"
 
 [personal-management-system]
 name = "personal-management-system"
@@ -1113,6 +1129,7 @@ name = "PIA"
 description = "A tool to help carrying out Privacy Impact Assessments"
 upstream = "https://github.com/LINCnil/pia"
 website = ""
+draft = "https://github.com/YunoHost-Apps/pia_ynh"
 
 [picsur]
 name = "Picsur"
@@ -1179,6 +1196,7 @@ name = "Proxigram"
 description = "Front-end for Instagram, providing also RSS"
 upstream = "https://codeberg.org/ThePenguinDev/Proxigram"
 website = ""
+draft = "https://github.com/YunoHost-Apps/proxigram_ynh"
 
 [psono]
 name = "Psono"
@@ -1191,6 +1209,7 @@ name = "Pterodactyl"
 description = "Game server management panel"
 upstream = "https://github.com/pterodactyl/panel"
 website = "https://pterodactyl.io/"
+draft = "https://github.com/YunoHost-Apps/pterodactyl_ynh"
 
 [qgis-server]
 name = "QGis server"
@@ -1287,6 +1306,7 @@ name = "SAT"
 description = "An all-in-one tool to manage all your communications"
 upstream = ""
 website = "https://salut-a-toi.org"
+draft = "https://github.com/YunoHost-Apps/sat_ynh"
 
 [screego]
 name = "Screego"
@@ -1299,6 +1319,7 @@ name = "Scribe"
 description = "An alternative frontend to Medium"
 upstream = "https://git.sr.ht/~edwardloveall/scribe"
 website = "https://scribe.rip/"
+draft = "https://github.com/YunoHost-Apps/scribe_ynh"
 
 [semantic-mediawiki]
 name = "Semantic MediaWiki"
@@ -1317,12 +1338,14 @@ name = "shadowsocks"
 description = "A SOCKS5 proxy to protect your Internet traffic"
 upstream = "https://github.com/shadowsocks/shadowsocks-org"
 website = "https://shadowsocks.org"
+draft = "https://github.com/YunoHost-Apps/shadowsocks_ynh"
 
 [shinken]
 name = "shinken"
 description = "A flexible and scalable monitoring framework"
 upstream = "https://github.com/naparuba/shinken"
 website = "http://www.shinken-monitoring.org/"
+draft = "https://github.com/YunoHost-Apps/shinken_ynh"
 
 [sickchill]
 name = "sickchill"
@@ -1365,6 +1388,7 @@ name = "sphinx"
 description = "The Sphinx documentation generator"
 upstream = "https://github.com/sphinx-doc/sphinx"
 website = "https://www.sphinx-doc.org/"
+draft = "https://github.com/YunoHost-Apps/sphinx_ynh"
 
 [spodcast]
 name = "Spodcast"
@@ -1425,6 +1449,7 @@ name = "Sympa"
 description = "Mailing List manager"
 upstream = "https://github.com/sympa-community/sympa"
 website = "https://www.sympa.community/"
+draft = "https://github.com/YunoHost-Apps/sympa_ynh"
 
 [syspass]
 name = "Syspass"
@@ -1527,6 +1552,7 @@ name = "tutao"
 description = "End-to-end encrypted e-mail client"
 upstream = "https://github.com/tutao/tutanota/"
 website = "https://tuta.com/"
+draft = "https://github.com/YunoHost-Apps/tutao_ynh"
 
 [twake-app]
 name = "Twake.app"
@@ -1545,6 +1571,7 @@ name = "umap"
 description = "Cartography software"
 upstream = ""
 website = "https://umap.openstreetmap.fr/"
+draft = "https://github.com/YunoHost-Apps/umap_ynh"
 
 [upmpdcli]
 name = "upmpdcli"
@@ -1587,6 +1614,7 @@ name = "webogram"
 description = "A new era of messaging"
 upstream = "https://github.com/zhukov/webogram"
 website = ""
+draft = "https://github.com/YunoHost-Apps/webogram_ynh"
 
 [webterminal]
 name = "Webterminal"
@@ -1641,6 +1669,7 @@ name = "Wisemapping"
 description = "An online mind mapping editor"
 upstream = "https://bitbucket.org/wisemapping/wisemapping-open-source"
 website = "https://www.wisemapping.com/"
+draft = "https://github.com/YunoHost-Apps/wisemapping_ynh"
 
 [workadventure]
 name = "WorkAdventure"
@@ -1683,6 +1712,7 @@ name = "Zammad"
 description = "Helpdesk/customer support system"
 upstream = "https://github.com/zammad/zammad"
 website = "https://zammad.org"
+draft = "https://github.com/YunoHost-Apps/zammad_ynh"
 
 [zigbee2mqtt-io]
 name = "zigbee2mqtt.io"
@@ -1707,3 +1737,4 @@ name = "Zulip"
 description = "Team chat that helps teams stay productive and focused."
 upstream = "https://github.com/zulip/zulip"
 website = "https://zulipchat.com/"
+draft = "https://github.com/YunoHost-Apps/zulip_ynh"