diff --git a/apps.json b/apps.json
index 509a746a..27e17ebc 100644
--- a/apps.json
+++ b/apps.json
@@ -2,18 +2,18 @@
     "20euros": {
         "branch": "master",
         "category": "games",
-        "level": 2,
-        "maintained": false,
-        "revision": "c8d5fadc9f042a92f14b753eff3ffc948322cf2d",
+        "level": 7,
+        "maintained": true,
+        "revision": "HEAD",
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/20euros_ynh"
     },
     "243": {
         "branch": "master",
         "category": "games",
-        "level": 2,
-        "maintained": false,
-        "revision": "b9d58efeac78feb7f74e723c999ff25ab7ab8b52",
+        "level": 7,
+        "maintained": true,
+        "revision": "HEAD",
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/243_ynh"
     },
@@ -336,6 +336,7 @@
     "codimd": {
         "branch": "master",
         "category": "office",
+        "level": 2,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -451,9 +452,8 @@
     "cubiks-2048": {
         "branch": "master",
         "category": "games",
-        "level": 3,
-        "maintained": false,
-        "revision": "1e0dce523039fcbd90e775a690018529b8190f18",
+        "maintained": true,
+        "revision": "HEAD",
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/Cubiks-2048_ynh"
     },
@@ -482,7 +482,8 @@
     "diaspora": {
         "branch": "master",
         "category": "social_media",
-        "revision": "b01c695cb81df24be2baa1fbe77f250c7f3195bd",
+        "level": 3,
+        "revision": "HEAD",
         "state": "working",
         "subtags": [
             "microblogging"
@@ -562,9 +563,9 @@
         "branch": "master",
         "category": "system_tools",
         "maintained": false,
-        "revision": "0c8d6674116b0da826375b5eaeab54ae1348a107",
+        "revision": "HEAD",
         "state": "notworking",
-        "url": "https://github.com/scith/dockerui_ynh"
+        "url": "https://github.com/YunoHost-Apps/dockerui_ynh"
     },
     "dokuwiki": {
         "branch": "master",
@@ -831,6 +832,7 @@
         "branch": "master",
         "category": "social_media",
         "level": 7,
+        "maintained": false,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -861,6 +863,7 @@
         "subtags": [
             "music"
         ],
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/funkwhale_ynh"
     },
     "galette": {
@@ -868,6 +871,7 @@
         "category": "productivity_and_management",
         "revision": "9b09a7c5cca5683bcc8d89034c6a8ec024a2a441",
         "state": "notworking",
+        "maintained": false,
         "subtags": [
             "business_and_ngos"
         ],
@@ -975,6 +979,17 @@
         ],
         "url": "https://github.com/matlink/gitweb_ynh"
     },
+    "glitchsoc": {
+        "branch": "master",
+        "category": "social_media",
+        "revision": "HEAD",
+        "url": "https://github.com/Tagadda/glitch-soc_ynh",
+        "subtags": [
+            "microblogging"
+        ],
+        "state": "inprogress"
+        
+    },
     "glowingbear": {
         "branch": "master",
         "category": "communication",
@@ -1197,6 +1212,14 @@
         "state": "notworking",
         "url": "https://github.com/mitra42/internetarchive_ynh"
     },
+    "invoiceninja": {
+        "branch": "master",
+        "category": "productivity_and_management",
+        "level": 1,
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://github.com/YunoHost-Apps/invoiceninja_ynh"
+    },
     "jappix": {
         "branch": "master",
         "category": "communication",
@@ -1296,7 +1319,7 @@
         "branch": "master",
         "category": "synchronization",
         "level": 7,
-        "maintained": true,
+        "maintained": "request_adoption",
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -1343,6 +1366,7 @@
         "subtags": [
             "accounting"
         ],
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/kresus_ynh"
     },
     "laverna": {
@@ -1433,13 +1457,13 @@
     "lionwiki-t2t": {
         "branch": "master",
         "category": "publishing",
-        "level": 0,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
             "wiki"
         ],
-        "url": "https://github.com/farvardin/lionwiki-t2t_ynh"
+        "url": "https://github.com/YunoHost-Apps/lionwiki-t2t_ynh"
     },
     "lstu": {
         "branch": "master",
@@ -1533,7 +1557,7 @@
     "matomo": {
         "branch": "master",
         "category": "publishing",
-        "level": 0,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -1544,7 +1568,7 @@
     "mattermost": {
         "branch": "master",
         "category": "communication",
-        "level": 4,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -1552,6 +1576,17 @@
         ],
         "url": "https://github.com/YunoHost-Apps/mattermost_ynh"
     },
+    "mautrix_whatsapp": {
+        "branch": "master",
+        "category": "communication",
+        "level": 0,
+        "revision": "HEAD",
+        "state": "working",
+        "subtags": [
+            "chat"
+        ],
+        "url": "https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh"
+    },
     "mediadrop": {
         "branch": "master",
         "category": "multimedia",
@@ -1596,6 +1631,16 @@
         ],
         "url": "https://github.com/guigot/medusa_ynh"
     },
+    "meilisearch" : {
+        "branch": "master",
+        "category": "dev",
+        "revision": "HEAD",
+        "state": "working",
+        "subtags": [
+            "programming"
+        ],
+        "url": "https://github.com/YunoHost-Apps/meilisearch_ynh"
+    },
     "menu": {
         "branch": "master",
         "category": "wat",
@@ -1643,7 +1688,7 @@
     "minidlna": {
         "branch": "master",
         "category": "multimedia",
-        "level": 2,
+        "level": 4,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -1687,7 +1732,7 @@
     "monica": {
         "branch": "master",
         "category": "wat",
-        "level": 2,
+        "level": 0,
         "revision": "HEAD",
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/monica_ynh"
@@ -1784,6 +1829,7 @@
         "subtags": [
             "meeting"
         ],
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/mumbleserver_ynh"
     },
     "munin": {
@@ -1799,7 +1845,7 @@
     "my-mind": {
         "branch": "master",
         "category": "office",
-        "level": 1,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -1852,6 +1898,12 @@
         ],
         "url": "https://github.com/YunoHost-Apps/netdata_ynh"
     },
+    "neutrinet": {
+        "branch": "stable",
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://gitlab.domainepublic.net/Neutrinet/neutrinet_ynh"
+    },
     "nextcloud": {
         "branch": "master",
         "category": "synchronization",
@@ -1889,6 +1941,7 @@
         "branch": "master",
         "category": "communication",
         "level": 2,
+        "maintained": false,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -2044,6 +2097,7 @@
         "subtags": [
             "forge"
         ],
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/pagure_ynh"
     },
     "peertube": {
@@ -2060,6 +2114,7 @@
     "pelican": {
         "branch": "master",
         "category": "publishing",
+        "maintained": false,
         "revision": "a2f37b8e277ba173b53f73320514f1fc7f3aa3ac",
         "state": "inprogress",
         "subtags": [
@@ -2732,7 +2787,7 @@
     "strut": {
         "branch": "master",
         "category": "office",
-        "level": 8,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -2748,6 +2803,7 @@
         "subtags": [
             "poll"
         ],
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/studs_ynh"
     },
     "subscribe": {
@@ -2794,7 +2850,7 @@
     "synapse": {
         "branch": "master",
         "category": "communication",
-        "level": 2,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -3027,7 +3083,7 @@
     "wallabag2": {
         "branch": "master",
         "category": "reading",
-        "level": 8,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/wallabag2_ynh"
@@ -3038,6 +3094,7 @@
         "level": 7,
         "revision": "HEAD",
         "state": "working",
+        "maintained": false,
         "url": "https://github.com/YunoHost-Apps/weblate_ynh"
     },
     "webmin": {
@@ -3168,6 +3225,7 @@
     "yeswiki": {
         "branch": "master",
         "category": "publishing",
+        "level": 5,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
@@ -3217,8 +3275,11 @@
     "yunomonitor": {
         "branch": "master",
         "category": "system_tools",
-        "revision": "63a22e81e0f334e04a14355b135167fe87338fad",
-        "state": "notworking",
+        "revision": "HEAD",
+        "state": "working",
+        "subtags": [
+            "monitoring"
+        ],
         "url": "https://github.com/YunoHost-Apps/yunomonitor_ynh"
     },
     "z-push": {
@@ -3290,7 +3351,7 @@
     "ztncui": {
         "branch": "master",
         "category": "system_tools",
-        "level": 2,
+        "level": 7,
         "revision": "HEAD",
         "state": "working",
         "subtags": [
diff --git a/list_builder.py b/list_builder.py
index 2636c7f1..12a26518 100755
--- a/list_builder.py
+++ b/list_builder.py
@@ -63,12 +63,12 @@ def refresh_all_caches():
             try:
                 init_cache(app, infos)
             except Exception as e:
-                error("Could not init cache for %s: %s" % (app, e))
+                error("Failed to init cache for %s" % app)
         else:
             try:
                 refresh_cache(app, infos)
             except Exception as e:
-                error("Could not refresh cache for %s: %s" % (app, e))
+                error("Failed to not refresh cache for %s" % app)
 
 
 def init_cache(app, infos):
@@ -80,7 +80,12 @@ def init_cache(app, infos):
     else:
         depth = 40
 
-    git("clone --quiet --depth {depth} --single-branch --branch master {url} {folder}".format(depth=depth, url=infos["url"], folder=app_cache_folder(app)))
+    git("clone --quiet --depth {depth} --single-branch --branch {branch} {url} {folder}".format(
+        depth=depth,
+        url=infos["url"],
+        branch=infos.get("branch", "master"),
+        folder=app_cache_folder(app))
+    )
 
 
 def refresh_cache(app, infos):
@@ -90,9 +95,19 @@ def refresh_cache(app, infos):
     if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 3600:
         return
 
-    git("remote set-url origin " + infos["url"], in_folder=app_cache_folder(app))
-    git("fetch --quiet origin master --force", in_folder=app_cache_folder(app))
-    git("reset origin/master --hard", in_folder=app_cache_folder(app))
+    branch=infos.get("branch", "master")
+
+    try:
+        git("remote set-url origin " + infos["url"], in_folder=app_cache_folder(app))
+        git("fetch --quiet origin %s --force" % branch, in_folder=app_cache_folder(app))
+        git("reset origin/%s --hard" % branch, in_folder=app_cache_folder(app))
+    except:
+        # Sometimes there are tmp issue such that the refresh cache ..
+        # we don't trigger an error unless the cache hasnt been updated since more than 24 hours
+        if os.path.exists(fetch_head) and now - os.path.getmtime(fetch_head) < 24*3600:
+            pass
+        else:
+            raise
 
 
 ################################
@@ -152,8 +167,6 @@ def build_catalog():
 
 def build_app_dict(app, infos):
 
-    assert infos["branch"] == "master"
-
     # Make sure we have some cache
     this_app_cache = app_cache_folder(app)
     assert os.path.exists(this_app_cache), "No cache yet for %s" % app