diff --git a/apps.json b/apps.json
index daeaa700..fa921108 100644
--- a/apps.json
+++ b/apps.json
@@ -39,10 +39,11 @@
     },
     "agendav": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/agendav_ynh"
     },
     "agora": {
@@ -62,10 +63,11 @@
     },
     "ampache": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/ampache_ynh"
     },
     "anarchism": {
@@ -98,10 +100,11 @@
     },
     "baikal": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/baikal_ynh"
     },
     "bicbucstriim": {
@@ -326,9 +329,10 @@
     },
     "dokuwiki": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/dokuwiki_ynh"
     },
     "dolibarr": {
@@ -382,9 +386,10 @@
     },
     "etherpad_mypads": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/etherpad_mypads_ynh"
     },
     "facette": {
@@ -656,10 +661,11 @@
     },
     "hextris": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/hextris_ynh"
     },
     "homeassistant": {
@@ -758,10 +764,11 @@
     },
     "jirafeau": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/jirafeau_ynh"
     },
     "jitsi": {
@@ -788,10 +795,11 @@
     },
     "kanboard": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/kanboard_ynh"
     },
     "keeweb": {
@@ -1124,10 +1132,11 @@
     },
     "my_webapp": {
         "branch": "master",
+        "high_quality": true,
         "level": 1,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/my_webapp_ynh"
     },
     "mycryptochat": {
@@ -1153,10 +1162,11 @@
     },
     "nextcloud": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/nextcloud_ynh"
     },
     "nexusoss": {
@@ -1213,9 +1223,10 @@
     },
     "opensondage": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/opensondage_ynh"
     },
     "openvpn": {
@@ -1306,10 +1317,11 @@
     },
     "phpmyadmin": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/phpmyadmin_ynh"
     },
     "phpsysinfo": {
@@ -1351,9 +1363,10 @@
     },
     "piwigo": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/piwigo_ynh"
     },
     "pixelfed": {
@@ -1436,10 +1449,11 @@
     },
     "rainloop": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/rainloop_ynh"
     },
     "redirect": {
@@ -1480,10 +1494,11 @@
     },
     "roundcube": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/roundcube_ynh"
     },
     "rss-bridge": {
@@ -1525,10 +1540,11 @@
     },
     "searx": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/searx_ynh"
     },
     "seenthis": {
@@ -1548,10 +1564,11 @@
     },
     "shellinabox": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/shellinabox_ynh"
     },
     "shsd": {
@@ -1659,9 +1676,10 @@
     },
     "strut": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/strut_ynh"
     },
     "studs": {
@@ -1695,9 +1713,10 @@
     },
     "synapse": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/synapse_ynh"
     },
     "syncthing": {
@@ -1769,10 +1788,11 @@
     },
     "transmission": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/transmission_ynh"
     },
     "transwhat": {
@@ -1784,10 +1804,11 @@
     },
     "ttrss": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/ttrss_ynh"
     },
     "turtl": {
@@ -1835,9 +1856,10 @@
     },
     "wallabag2": {
         "branch": "master",
+        "high_quality": true,
         "level": 4,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/wallabag2_ynh"
     },
     "webapp_multi_inst": {
@@ -1921,9 +1943,10 @@
     },
     "wordpress": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-Apps/wordpress_ynh"
     },
     "writefreely": {
@@ -1993,10 +2016,11 @@
     },
     "zerobin": {
         "branch": "master",
+        "high_quality": true,
         "level": 7,
         "maintained": "request_adoption",
         "revision": "HEAD",
-        "state": "validated",
+        "state": "working",
         "url": "https://github.com/YunoHost-apps/zerobin_ynh"
     },
     "zeronet": {
diff --git a/merge_official_and_community.py b/merge_official_and_community.py
index bb2771b2..caa502a8 100644
--- a/merge_official_and_community.py
+++ b/merge_official_and_community.py
@@ -3,6 +3,11 @@ import json
 community = json.loads(open("community.json").read())
 official = json.loads(open("official.json").read())
 
+# Add high quality and set working state for official apps
+for app, infos in official.items():
+    infos["high_quality"] = True
+    infos["state"] = "working"
+
 merged = community
 merged.update(official)