diff --git a/app/models/appcatalog.py b/app/models/appcatalog.py
index f3f7ac2..ddeb5c3 100644
--- a/app/models/appcatalog.py
+++ b/app/models/appcatalog.py
@@ -47,7 +47,7 @@ class AppCatalog():
             if isinstance(maintainers_info, list):
                 known_app.maintainers = [ maintainer["name"] for maintainer in maintainers_info ]
 
-            known_app.maintained = 'package-not-maintained' not in app.get('antifeatures', []),
+            known_app.maintained = 'package-not-maintained' not in app.get('antifeatures', [])
             known_app.state = app["state"]
             known_app.public_level = app.get("level", None)
 
diff --git a/app/models/appci.py b/app/models/appci.py
index 87df1c7..97032b0 100644
--- a/app/models/appci.py
+++ b/app/models/appci.py
@@ -23,7 +23,7 @@ class AppCIBranch(db.Model):
                           arch="amd64",
                           branch="stable",
                           display_name='Stable (x86)',
-                          url='https://ci-apps.yunohost.org/ci/logs/list_level_stable_amd64.json',
+                          url='https://ci-apps.yunohost.org/ci/api/results',
                           url_per_app='https://ci-apps.yunohost.org/ci/apps/{}/latestjob')
 
         yield AppCIBranch(name='unstable',
diff --git a/app/models/unlistedapps.py b/app/models/unlistedapps.py
index 85e0e65..37439f4 100644
--- a/app/models/unlistedapps.py
+++ b/app/models/unlistedapps.py
@@ -2,6 +2,7 @@ import requests
 import json
 import datetime
 import os
+import toml
 
 from .. import db
 
@@ -24,7 +25,7 @@ class UnlistedApp(db.Model):
 
         UnlistedApp.query.delete()
 
-        community = json.loads(requests.get("https://raw.githubusercontent.com/YunoHost/apps/master/apps.json").text)
+        community = toml.loads(requests.get("https://raw.githubusercontent.com/YunoHost/apps/master/apps.toml").text)
 
         known_apps = set()
         known_apps = known_apps.union([os.path.basename(app["url"]).lower() for app in community.values() ])
diff --git a/app/scripts/appListsHistory/script.py b/app/scripts/appListsHistory/script.py
index af5c912..1be0136 100644
--- a/app/scripts/appListsHistory/script.py
+++ b/app/scripts/appListsHistory/script.py
@@ -1,4 +1,4 @@
-
+import toml
 import json
 import os
 import sys
@@ -63,9 +63,12 @@ def get_lists_history():
             merged.update(official)
         else:
             try:
-                merged = json.loads(open("./.work/apps/apps.json").read())
+                merged = toml.loads(open("./.work/apps/apps.toml").read())
             except:
-                pass
+                try:
+                    merged = json.loads(open("./.work/apps/apps.json").read())
+                except:
+                    pass
 
         # Save it
         json.dump(merged, open('./.work/merged_lists.json.%s' % t.strftime("%y-%m-%d"), 'w'))