diff --git a/addons_updater/config.json b/addons_updater/config.json
index 439d0c3c1..59f3e7aee 100644
--- a/addons_updater/config.json
+++ b/addons_updater/config.json
@@ -1,45 +1,48 @@
 {
-  "name": "Addons_Updater",
-  "version": "3.2",
-  "slug": "updater",
-  "description": "Automatic addons update by aligning version tag with upstream releases",
-  "url": "https://github.com/alexbelgium/hassio-addons",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
-  "ports": {},
-  "ports_description": {},
-  "startup": "once",
   "boot": "manual",
-  "environment": { "GIT_DISCOVERY_ACROSS_FILESYSTEM": "1" },
+  "description": "Automatic addons update by aligning version tag with upstream releases",
+  "environment": {
+    "GIT_DISCOVERY_ACROSS_FILESYSTEM": "1"
+  },
+  "name": "Addons_Updater",
   "options": {
     "addon": [
       {
-        "slug": "addon slug",
         "beta": false,
         "fulltag": false,
         "repository": "https://github.com/user/repo",
+        "slug": "addon slug",
         "upstream": "github_user/repo_name"
       }
     ],
-    "gituser": "gituser",
-    "gitpass": "gitpassword",
     "gitmail": "youremail@gmail.com",
+    "gitpass": "gitpassword",
+    "gituser": "gituser",
     "verbose": true
   },
+  "ports": {},
+  "ports_description": {},
   "schema": {
     "addon": [
       {
-        "slug": "str",
         "beta": "bool",
         "fulltag": "bool",
         "having_asset": "bool?",
         "repository": "str",
+        "slug": "str",
         "upstream": "str"
       }
     ],
-    "gituser": "str",
-    "gitpass": "str",
-    "gitmail": "str",
     "gitapi": "str?",
+    "gitmail": "str",
+    "gitpass": "str",
+    "gituser": "str",
     "verbose": "bool"
-  }
+  },
+  "slug": "updater",
+  "startup": "once",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "3.2"
 }
diff --git a/bazarr/config.json b/bazarr/config.json
index cee670758..539e4fcdb 100644
--- a/bazarr/config.json
+++ b/bazarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "backup_exclude": ["**/Backups/*", "**/logs/*", "**/MediaCover/*"],
   "boot": "auto",
diff --git a/bitwarden/config.json b/bitwarden/config.json
index 4a0eb8c6c..517c46113 100644
--- a/bitwarden/config.json
+++ b/bitwarden/config.json
@@ -1,14 +1,9 @@
 {
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7"
-  ],
+  "apparmor": true,
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Open source password management solution",
   "init": false,
-  "map": [
-    "ssl"
-  ],
+  "map": ["ssl"],
   "name": "Bitwarden (Vaultwarden)",
   "options": {
     "ssl": true,
diff --git a/cloudcommander/config.json b/cloudcommander/config.json
index 3f918678a..00673f65a 100644
--- a/cloudcommander/config.json
+++ b/cloudcommander/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "description": "Cloud Commander a file manager for the web with console and editor",
   "devices": [
diff --git a/code-server/config.json b/code-server/config.json
index 93473d65f..ea40ce3e0 100644
--- a/code-server/config.json
+++ b/code-server/config.json
@@ -1,45 +1,44 @@
 {
-  "name": "VS code",
-  "version": "3.12.0-2",
-  "upstream": "3.12.0",
-  "slug": "code-server",
-  "description": "Code-server is VS Code running on a remote server, accessible through the browser.",
-  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server#readme",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
-  "ports": {
-    "8443/tcp": 8443
-  },
-  "map": [
-    "backup:rw",
-    "config:rw",
-    "share:rw",
-    "media:rw",
-    "ssl"
-  ],
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH"
-  ],
-  "devices": [
-    "/dev/sda1", "/dev/sdb1", "/dev/sdc1", "/dev/sdd1", "/dev/sde1", "/dev/sdf1", "/dev/sdg1",
-    "/dev/sda2", "/dev/sdb2", "/dev/sdc2", "/dev/sdd2", "/dev/sde2", "/dev/sdf2", "/dev/sdg2"
-  ],
-  "webui": "http://[HOST]:[PORT:8443]",
+  "apparmor": true,
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
+  "description": "Code-server is VS Code running on a remote server, accessible through the browser.",
+  "devices": [
+    "/dev/sda1",
+    "/dev/sdb1",
+    "/dev/sdc1",
+    "/dev/sdd1",
+    "/dev/sde1",
+    "/dev/sdf1",
+    "/dev/sdg1",
+    "/dev/sda2",
+    "/dev/sdb2",
+    "/dev/sdc2",
+    "/dev/sdd2",
+    "/dev/sde2",
+    "/dev/sdf2",
+    "/dev/sdg2"
+  ],
   "environment": {},
+  "map": ["backup:rw", "config:rw", "share:rw", "media:rw", "ssl"],
+  "name": "VS code",
   "options": {
     "PUID": 0,
     "PGID": 0
   },
+  "ports": {
+    "8443/tcp": 8443
+  },
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
   "schema": {
     "PUID": "int",
     "PGID": "int",
     "TZ": "str?"
-  }
+  },
+  "slug": "code-server",
+  "startup": "services",
+  "upstream": "3.12.0",
+  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server#readme",
+  "version": "3.12.0-2",
+  "webui": "http://[HOST]:[PORT:8443]"
 }
diff --git a/doublecommander/apparmor.txt b/doublecommander/apparmor.txt
new file mode 100644
index 000000000..b56780b16
--- /dev/null
+++ b/doublecommander/apparmor.txt
@@ -0,0 +1,49 @@
+#include <tunables/global>
+
+profile doublecommander_addon flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+  
+  capability,
+  file,
+  mount,
+  umount,
+  remount,
+
+  capability setgid,
+  capability setuid,
+  capability sys_admin, 
+  capability dac_read_search, 
+  # capability dac_override,
+  # capability sys_rawio,
+
+# S6-Overlay
+  /bin/** ix,
+  /usr/bin/** ix,
+  /usr/lib/bashio/** ix,
+  /etc/s6/** rix,
+  /run/s6/** rix,
+  /etc/services.d/** rwix,
+  /etc/cont-init.d/** rwix,
+  /etc/cont-finish.d/** rwix,
+  /init rix,
+  /var/run/** mrwkl,
+  /var/run/ mrwkl,
+  /dev/i2c-1 mrwkl, 
+  # Files required
+  /dev/sda1 mrwkl,
+  /dev/sdb1 mrwkl,
+  /dev/mmcblk0p1 mrwkl,
+  /dev/* mrwkl,
+  /tmp/** mrkwl,
+  
+  # Data access
+  /data/** rw,
+  /** rw,
+
+  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
+  ptrace (trace,read) peer=docker-default,
+ 
+  # docker daemon confinement requires explict allow rule for signal
+  signal (receive) set=(kill,term) peer=/usr/bin/docker,
+
+}
diff --git a/doublecommander/config.json b/doublecommander/config.json
index 80f30c7a7..1d319cd7b 100644
--- a/doublecommander/config.json
+++ b/doublecommander/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Double Commander is a free cross platform open source file manager with two panels side by side.",
diff --git a/emby/config.json b/emby/config.json
index fabbda3b6..7b56543cb 100644
--- a/emby/config.json
+++ b/emby/config.json
@@ -1,5 +1,5 @@
 {
-  "apparmor": "true",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "backup_exclude": [
     "*/cache/",
diff --git a/flexget/config.json b/flexget/config.json
index 680555321..9bc44a1d5 100644
--- a/flexget/config.json
+++ b/flexget/config.json
@@ -1,39 +1,32 @@
 {
-  "name": "Flexget",
-  "version": "3.1.144",
-  "upstream": "3.1.144",
-  "slug": "flexget",
+  "apparmor": true,
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "FlexGet is a multipurpose automation tool for all of your media",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "webui": "http://[HOST]:[PORT:5050]",
+  "environment": {
+    "FG_PLUGINS": "",
+    "FG_WEBUI_PASSWD": ""
+  },
+  "map": ["share:rw", "config:rw"],
+  "name": "Flexget",
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+  },
   "ports": {
     "5050/tcp": 5050
   },
   "ports_description": {
     "5050/tcp": "Web interface"
   },
-  "map": [
-    "share:rw",
-    "config:rw"
-  ],
-  "environment": {
-    "FG_PLUGINS": "",
-    "FG_WEBUI_PASSWD": ""
-  },
-  "options": {
-    "PUID": 0,
-    "PGID": 0
-  },
   "schema": {
     "PUID": "int",
     "PGID": "int",
     "WebuiPass": "str?",
     "FG_PLUGINS": "str?"
   },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "slug": "flexget",
+  "upstream": "3.1.144",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "3.1.144",
+  "webui": "http://[HOST]:[PORT:5050]"
 }
diff --git a/freqtrade/config.json b/freqtrade/config.json
index 4c335ef14..a0b630fed 100644
--- a/freqtrade/config.json
+++ b/freqtrade/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Simple High frequency trading bot for crypto currencies ",
diff --git a/grav/config.json b/grav/config.json
index e7572bcc0..6da20213b 100644
--- a/grav/config.json
+++ b/grav/config.json
@@ -1,21 +1,10 @@
 {
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Fast, Simple, and Flexible, file-based Web-platform",
-  "devices": [
-  ],
-  "environment": {
-  },
-  "map": [
-    "share:rw",
-    "media:rw",
-    "config:rw"
-  ],
+  "devices": [],
+  "environment": {},
+  "map": ["share:rw", "media:rw", "config:rw"],
   "name": "Grav web server",
   "options": {
     "PUID": 1000,
@@ -27,10 +16,9 @@
   "ports_description": {
     "80/tcp": "web interface"
   },
-  "privileged": [
-  ],
+  "privileged": [],
   "schema": {
-    "PUID": "int", 
+    "PUID": "int",
     "PGID": "int",
     "TZ": "str?"
   },
diff --git a/inadyn/config.json b/inadyn/config.json
index fb3d6917d..3135c6331 100644
--- a/inadyn/config.json
+++ b/inadyn/config.json
@@ -1,22 +1,10 @@
 {
-  "name": "Inadyn",
-  "version": "2.8.1",
-  "upstream": "2.8.1",
-  "slug": "inadyn",
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "description": "Inadyn is a small and simple Dynamic DNS, DDNS, client with HTTPS support. A large number of dynamic dns providers are supported (https://github.com/troglobit/inadyn#supported-providers). For those that are not, you can use a custom provider as per this project's documentation (https://github.com/nalipaz/hassio-addons/blob/master/README.md)",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
-  "map": [
-    "ssl"
-  ],
+  "environment": {},
   "host_network": true,
-  "environment": {
-  },
+  "map": ["ssl"],
+  "name": "Inadyn",
   "options": {
     "providers": [
       {
@@ -55,5 +43,9 @@
         "append_myip": "bool?"
       }
     ]
-  }
+  },
+  "slug": "inadyn",
+  "upstream": "2.8.1",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "2.8.1"
 }
diff --git a/jackett/config.json b/jackett/config.json
index d93cdef13..8bec828fc 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -1,44 +1,25 @@
 {
-  "name": "Jackett NAS",
-  "version": "0.19.34",
-  "upstream": "0.19.34",
-  "slug": "jackett_nas",
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
   "description": "translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
+  "environment": {
+    "PUID": "0",
+    "PGID": "0"
+  },
+  "full_access": true,
+  "map": ["config:rw", "share:rw", "media:rw", "ssl"],
+  "name": "Jackett NAS",
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+  },
   "ports": {
     "9117/tcp": 9117
   },
   "ports_description": {
     "9117/tcp": "web interface"
   },
-  "map": [
-    "config:rw",
-    "share:rw",
-    "media:rw",
-    "ssl"
-  ],
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH"
-  ],
-  "full_access": true,
-  "webui": "http://[HOST]:[PORT:9117]",
-  "boot": "auto",
-  "environment": {
-    "PUID": "0",
-    "PGID": "0"
-  },
-  "options": {
-    "PUID": 0,
-    "PGID": 0
-  },
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
   "schema": {
     "PUID": "int",
     "PGID": "int",
@@ -47,5 +28,11 @@
     "networkdisks": "str?",
     "cifsusername": "str?",
     "cifspassword": "str?"
-  }
+  },
+  "slug": "jackett_nas",
+  "startup": "services",
+  "upstream": "0.19.34",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "0.19.34",
+  "webui": "http://[HOST]:[PORT:9117]"
 }
diff --git a/jellyfin/config.json b/jellyfin/config.json
index f303e5026..3f5022641 100644
--- a/jellyfin/config.json
+++ b/jellyfin/config.json
@@ -1,5 +1,5 @@
 {
-  "apparmor": "true",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "A Free Software Media System that puts you in control of managing and streaming your media.",
diff --git a/joal/config.json b/joal/config.json
index 11aa027dc..1b73bc851 100644
--- a/joal/config.json
+++ b/joal/config.json
@@ -1,23 +1,19 @@
 {
-  "name": "Joal",
-  "version": "2.1.26-2",
-  "upstream": "2.1.26",
-  "slug": "joal",
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
   "description": "An open source command line RatioMaster with WebUI",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "startup": "services",
+  "environment": {},
+  "host_network": false,
   "ingress": true,
   "ingress_port": 8099,
+  "map": ["config:rw"],
+  "name": "Joal",
+  "options": {
+    "ui_path": "joal",
+    "secret_token": "lrMY24Byhx",
+    "run_duration": "12h"
+  },
   "panel_icon": "mdi:owl",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
-  "map": [
-    "config:rw"
-  ],
   "ports": {
     "49152/tcp": null,
     "8081/tcp": 8091
@@ -26,19 +22,16 @@
     "49152/tcp": "torrent port (not required)",
     "8081/tcp": "Web UI port (required)"
   },
-  "webui": "http://[HOST]:[PORT:8081]/joal/ui",
-  "boot": "auto",
-  "host_network": false,
-  "environment": {},
-  "options": {
-    "ui_path": "joal",
-    "secret_token": "lrMY24Byhx",
-    "run_duration": "12h"
-  },
   "schema": {
     "ui_path": "str",
     "secret_token": "str",
     "run_duration": "str?",
     "verbose": "bool?"
-  }
+  },
+  "slug": "joal",
+  "startup": "services",
+  "upstream": "2.1.26",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "2.1.26-2",
+  "webui": "http://[HOST]:[PORT:8081]/joal/ui"
 }
diff --git a/joplin/config.json b/joplin/config.json
index 8a1b1042f..a04d57299 100644
--- a/joplin/config.json
+++ b/joplin/config.json
@@ -9,13 +9,11 @@
   "ports": {
     "22300/tcp": 22300
   },
-  "apparmor": "true",
+  "apparmor": true,
   "ports_description": {
     "22300/tcp": "Web interface"
   },
-  "map": [
-    "ssl"
-  ],
+  "map": ["ssl"],
   "environment": {
     "APP_PORT": "22300"
   },
@@ -39,10 +37,5 @@
     "MAILER_NOREPLY_NAME": "str?",
     "MAILER_NOREPLY_EMAIL": "str?"
   },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "arch": ["aarch64", "amd64", "armhf", "armv7"]
 }
diff --git a/lidarr/config.json b/lidarr/config.json
index d96f1b012..3340343f8 100644
--- a/lidarr/config.json
+++ b/lidarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Music collection manager for Usenet and BitTorrent users",
diff --git a/mealie/config.json b/mealie/config.json
index d7a753042..92d525b97 100644
--- a/mealie/config.json
+++ b/mealie/config.json
@@ -1,15 +1,20 @@
 {
-  "name": "Mealie",
-  "version": "0.5.2-4",
-  "upstream": "0.5.2",
-  "slug": "mealie",
-  "description": "Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:9925]",
-  "startup": "services",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "boot": "auto",
+  "description": "Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family",
+  "environment": {
+    "DB_ENGINE": "sqlite",
+    "APP_PORT": "9925"
+  },
   "ingress": false,
   "ingress_port": 8099,
+  "map": ["share:rw", "ssl:rw"],
+  "name": "Mealie",
+  "options": {
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem"
+  },
   "panel_icon": "mdi:silverware-fork-knife",
   "ports": {
     "9925/tcp": "9925"
@@ -17,28 +22,15 @@
   "ports_description": {
     "80/tcp": "Web interface"
   },
-  "map": [
-    "share:rw", 
-    "ssl:rw"
-  ],
-  "environment": {
-    "DB_ENGINE": "sqlite",
-    "APP_PORT": "9925"
-  },
-  "options": {
-    "ssl": false,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
-  },
   "schema": {
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str"
-    },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  },
+  "slug": "mealie",
+  "startup": "services",
+  "upstream": "0.5.2",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "0.5.2-4",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:9925]"
 }
diff --git a/ombi/config.json b/ombi/config.json
index e6f7dd9ab..d9c624fe0 100644
--- a/ombi/config.json
+++ b/ombi/config.json
@@ -1,33 +1,26 @@
 {
-  "name": "Ombi",
-  "version": "4.0.1468",
-  "upstream": "4.0.1468",
-  "slug": "ombi",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "Self-hosted Plex Request and user management system",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "webui": "http://[HOST]:[PORT:3579]",
+  "environment": {},
+  "map": ["config:rw"],
+  "name": "Ombi",
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+  },
   "ports": {
     "3579/tcp": 3579
   },
   "ports_description": {
     "3579/tcp": "Web interface"
   },
-  "map": [
-    "config:rw"
-  ],
-  "environment": {},
-  "options": {
-    "PUID": 0,
-    "PGID": 0
-  },
   "schema": {
     "PUID": "int",
     "PGID": "int"
   },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "slug": "ombi",
+  "upstream": "4.0.1468",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "4.0.1468",
+  "webui": "http://[HOST]:[PORT:3579]"
 }
diff --git a/photoprism/config.json b/photoprism/config.json
index 12d5b46f8..1efa70f0d 100644
--- a/photoprism/config.json
+++ b/photoprism/config.json
@@ -1,5 +1,5 @@
 {
-  "apparmor": "true",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "A server-based application for browsing, organizing and sharing your personal photo collection",
   "devices": [
diff --git a/piwigo/config.json b/piwigo/config.json
index ea751ad01..6dfd8574b 100644
--- a/piwigo/config.json
+++ b/piwigo/config.json
@@ -1,45 +1,39 @@
 {
-  "name": "Piwigo",
-  "version": "11.5.0-8",
-  "upstream": "11.5.0",
-  "slug": "piwigo",
-  "stage": "experimental",
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
   "description": "Piwigo is a photo gallery software for the web",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
+  "devices": [
+    "/dev/sda1",
+    "/dev/sdb1",
+    "/dev/sdc1",
+    "/dev/sdd1",
+    "/dev/sde1",
+    "/dev/sdf1",
+    "/dev/sdg1",
+    "/dev/sda2",
+    "/dev/sdb2",
+    "/dev/sdc2",
+    "/dev/sdd2",
+    "/dev/sde2",
+    "/dev/sdf2",
+    "/dev/sdg2"
   ],
+  "environment": {
+    "PWG_LOCAL_DIR": "/data"
+  },
+  "map": ["media:rw", "share:rw", "ssl"],
+  "name": "Piwigo",
+  "options": {
+    "PUID": 1000,
+    "PGID": 1000
+  },
   "ports": {
     "80/tcp": 81
   },
   "ports_description": {
     "80/tcp": "Web UI port"
   },
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH"
-  ],
-  "devices":[
-    "/dev/sda1", "/dev/sdb1", "/dev/sdc1", "/dev/sdd1", "/dev/sde1", "/dev/sdf1", "/dev/sdg1",
-    "/dev/sda2", "/dev/sdb2", "/dev/sdc2", "/dev/sdd2", "/dev/sde2", "/dev/sdf2", "/dev/sdg2"
-  ],
-  "map": [
-    "media:rw",
-    "share:rw",
-    "ssl"
-  ],
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
-  "boot": "auto",
-  "environment": {
-    "PWG_LOCAL_DIR": "/data"},
-  "options": {
-    "PUID": 1000,
-    "PGID": 1000
-  },
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
   "schema": {
     "PUID": "int",
     "PGID": "int",
@@ -48,5 +42,12 @@
     "cifsusername": "str?",
     "cifspassword": "str?",
     "TZ": "str?"
-  }
+  },
+  "slug": "piwigo",
+  "stage": "experimental",
+  "startup": "services",
+  "upstream": "11.5.0",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "11.5.0-8",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
 }
diff --git a/plex/config.json b/plex/config.json
index 3cb06c578..fe3872c91 100644
--- a/plex/config.json
+++ b/plex/config.json
@@ -1,5 +1,5 @@
 {
-  "apparmor": "true",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Plex organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices.",
diff --git a/portainer/config.json b/portainer/config.json
index 6d68a19e6..e8a95d54a 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -1,27 +1,22 @@
 {
-  "name": "Portainer",
-  "version": "2.9.1-5",
-  "upstream": "2.9.1",
-  "slug": "portainer",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "Manage your Docker environment with ease",
-  "url": "https://github.com/hassio-addons/addon-portainer",
+  "docker_api": true,
+  "hassio_api": true,
+  "homeassistant": "0.92.0b2",
   "ingress": true,
   "ingress_port": 1337,
   "ingress_stream": true,
-  "startup": "services",
-  "panel_icon": "mdi:docker",
-  "homeassistant": "0.92.0b2",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ],
   "init": false,
-  "map": [
-    "share:rw",
-    "ssl"
-  ],
+  "map": ["share:rw", "ssl"],
+  "name": "Portainer",
+  "options": {
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "password": "default"
+  },
+  "panel_icon": "mdi:docker",
   "ports": {
     "9099/tcp": 9000,
     "8000/tcp": null
@@ -30,19 +25,16 @@
     "9099/tcp": "Web UI port",
     "8000/tcp": "Edge Agent Api (Enable when managing remote edge agents)"
   },
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:9099]",
-  "hassio_api": true,
-  "docker_api": true,
-  "options": {
-    "ssl": false,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
-    "password": "default"
-  },
   "schema": {
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",
     "password": "str?"
-  }
+  },
+  "slug": "portainer",
+  "startup": "services",
+  "upstream": "2.9.1",
+  "url": "https://github.com/hassio-addons/addon-portainer",
+  "version": "2.9.1-5",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:9099]"
 }
diff --git a/prowlarr/config.json b/prowlarr/config.json
index e9d6f8470..ecc6a6877 100644
--- a/prowlarr/config.json
+++ b/prowlarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Torrent Trackers and Usenet Indexers offering complete management ofSonarr, Radarr, Lidarr, and Readarr indexers with no per app setup required",
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
index 33df56fe7..2ff30f505 100644
--- a/qbittorrent/config.json
+++ b/qbittorrent/config.json
@@ -1,48 +1,9 @@
 {
-  "name": "Qbittorrent",
-  "version": "14.3.8.99202110120741-7429-1bae770b2ubuntu20.04.1-ls158-3",
-  "upstream": "14.3.8.99202110120741-7429-1bae770b2ubuntu20.04.1-ls158",
-  "slug": "qbittorrent",
-  "description": "qBittorrent is a bittorrent client",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
-  "ingress": true,
-  "ingress_port": 8099,
-  "panel_icon": "mdi:progress-download",
-  "hassio_api": true,
-  "hassio_role": "homeassistant",
-  "homeassistant_api": true,
-  "backup_exclude": [
-    "image.tar"
-  ],
-  "ports": {
-    "8080/tcp": 8081,
-    "6881/tcp": 6881,
-    "6881/udp": 6881
-  },
-  "ports_description": {
-    "8080/tcp": "Web UI port (nor required for Ingress)",
-    "6881/tcp": "Peer port",
-    "6881/udp": "Peer port"
-  },
-  "map": [
-    "media:rw",
-    "config:rw",
-    "share:rw",
-    "ssl"
-  ],
   "apparmor": true,
-  "host_network": false,
-  "privileged": [
-    "SYS_ADMIN",
-    "DAC_READ_SEARCH",
-    "NET_ADMIN"
-  ],
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "backup_exclude": ["image.tar"],
+  "boot": "auto",
+  "description": "qBittorrent is a bittorrent client",
   "devices": [
     "/dev/net/tun",
     "/dev/sda1",
@@ -60,14 +21,19 @@
     "/dev/sdf2",
     "/dev/sdg2"
   ],
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]",
-  "watchdog": "[PROTO:ssl]://[HOST]:[PORT:8080]",
-  "boot": "auto",
   "environment": {
     "WEBUI_PORT": "8080",
     "PUID": "0",
     "PGID": "0"
   },
+  "hassio_api": true,
+  "hassio_role": "homeassistant",
+  "homeassistant_api": true,
+  "host_network": false,
+  "ingress": true,
+  "ingress_port": 8099,
+  "map": ["media:rw", "config:rw", "share:rw", "ssl"],
+  "name": "Qbittorrent",
   "options": {
     "ssl": false,
     "certfile": "fullchain.pem",
@@ -80,6 +46,18 @@
     "PUID": "0",
     "PGID": "0"
   },
+  "panel_icon": "mdi:progress-download",
+  "ports": {
+    "8080/tcp": 8081,
+    "6881/tcp": 6881,
+    "6881/udp": 6881
+  },
+  "ports_description": {
+    "8080/tcp": "Web UI port (nor required for Ingress)",
+    "6881/tcp": "Peer port",
+    "6881/udp": "Peer port"
+  },
+  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH", "NET_ADMIN"],
   "schema": {
     "ssl": "bool",
     "certfile": "str",
@@ -104,5 +82,11 @@
     "openvpn_password": "str?",
     "run_duration": "str?",
     "TZ": "str?"
-  }
+  },
+  "slug": "qbittorrent",
+  "upstream": "14.3.8.99202110120741-7429-1bae770b2ubuntu20.04.1-ls158",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "14.3.8.99202110120741-7429-1bae770b2ubuntu20.04.1-ls158-3",
+  "watchdog": "[PROTO:ssl]://[HOST]:[PORT:8080]",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/radarr/config.json b/radarr/config.json
index 6f4d1eae2..1c2bfd011 100644
--- a/radarr/config.json
+++ b/radarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "A fork of Sonarr to work with movies like Couchpotato",
diff --git a/readarr/config.json b/readarr/config.json
index e0accc186..6797485ee 100644
--- a/readarr/config.json
+++ b/readarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Book Manager and Automation",
diff --git a/resiliosync/config.json b/resiliosync/config.json
index 7370e62c5..0ac7a6dd3 100644
--- a/resiliosync/config.json
+++ b/resiliosync/config.json
@@ -1,12 +1,14 @@
 {
-  "name": "ResilioSync",
-  "version": "2.7.2.1375-5",
-  "upstream": "2.7.2.1375",
-  "slug": "resiliosync",
-  "description": "Self-hosted file share and collaboration platform on the web",
-  "url": "https://github.com/tyjtyj/hassio-addons",
-  "webui": "http://[HOST]:[PORT:8888]",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "boot": "auto",
+  "description": "Self-hosted file share and collaboration platform on the web",
+  "environment": {},
+  "map": ["share:rw", "config:rw"],
+  "name": "ResilioSync",
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+  },
   "ports": {
     "8888/tcp": 8888,
     "55555/tcp": 55555
@@ -15,24 +17,13 @@
     "8888/tcp": "Web interface",
     "55555/tcp": "Sync Port"
   },
-  "map": [
-    "share:rw", 
-    "config:rw"
-  ],
-  "environment": {
-  },
-  "options": {
-    "PUID": 0,
-    "PGID": 0
-  },
   "schema": {
     "PUID": "int",
     "PGID": "int"
   },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "slug": "resiliosync",
+  "upstream": "2.7.2.1375",
+  "url": "https://github.com/tyjtyj/hassio-addons",
+  "version": "2.7.2.1375-5",
+  "webui": "http://[HOST]:[PORT:8888]"
 }
diff --git a/scrutiny/config.json b/scrutiny/config.json
index f0d800eee..1ce1865f2 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -6,12 +6,7 @@
   "description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring",
   "url": "https://github.com/AnalogJ/scrutiny",
   "startup": "services",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7",
-    "armhf"
-  ],
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "ingress": true,
   "ingress_port": 8099,
   "panel_icon": "mdi:glasses",
@@ -22,16 +17,24 @@
     "8080/tcp": "Web UI port"
   },
   "devices": [
-    "/dev/sda1", "/dev/sdb1", "/dev/sdc1", "/dev/sdd1", "/dev/sde1", "/dev/sdf1", "/dev/sdg1",
-    "/dev/sda2", "/dev/sdb2", "/dev/sdc2", "/dev/sdd2", "/dev/sde2", "/dev/sdf2", "/dev/sdg2"
-  ],
-  "privileged": [
-    "SYS_ADMIN",
-    "SYS_RAWIO",
-    "DAC_READ_SEARCH"
+    "/dev/sda1",
+    "/dev/sdb1",
+    "/dev/sdc1",
+    "/dev/sdd1",
+    "/dev/sde1",
+    "/dev/sdf1",
+    "/dev/sdg1",
+    "/dev/sda2",
+    "/dev/sdb2",
+    "/dev/sdc2",
+    "/dev/sdd2",
+    "/dev/sde2",
+    "/dev/sdf2",
+    "/dev/sdg2"
   ],
+  "privileged": ["SYS_ADMIN", "SYS_RAWIO", "DAC_READ_SEARCH"],
   "udev": "true",
-  "apparmor": "true",
+  "apparmor": true,
   "map": [],
   "boot": "auto",
   "environment": {
diff --git a/sonarr/config.json b/sonarr/config.json
index a429c5446..4b8fc95c0 100644
--- a/sonarr/config.json
+++ b/sonarr/config.json
@@ -1,4 +1,5 @@
 {
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. ",
diff --git a/teamspeak/config.json b/teamspeak/config.json
index 4d58b8664..6c0bf563f 100644
--- a/teamspeak/config.json
+++ b/teamspeak/config.json
@@ -1,35 +1,30 @@
 {
-  "name": "Teamspeak server",
-  "version": "3.13.6",
-  "upstream": "3.13.6",
-  "slug": "teamspeak",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "voice communication for online gaming, education and training",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "ports": {
-  "9987/udp": "9987",
-  "10011/tcp": "10011",
-  "30033/tcp": "30033",
-  "41144/tcp": 41144
+  "environment": {
+    "TS3SERVER_LICENSE": "accept",
+    "PUID": "503",
+    "GUID": "503",
+    "INIFILE": "1",
+    "DIST_UPDATE": "1",
+    "TS_UPDATE": "1"
   },
   "map": ["share:rw"],
+  "name": "Teamspeak server",
+  "ports": {
+    "9987/udp": "9987",
+    "10011/tcp": "10011",
+    "30033/tcp": "30033",
+    "41144/tcp": 41144
+  },
   "ports_description": {
     "80/udp": "Voice",
     "10011/tcp": "ServerQuery (raw)",
     "30033/tcp": "Filetransfer",
-    "41144/tcp": "TSDNS" 
+    "41144/tcp": "TSDNS"
   },
-  "environment": {
-     "TS3SERVER_LICENSE": "accept", 
-     "PUID": "503",
-     "GUID": "503", 
-     "INIFILE": "1",
-     "DIST_UPDATE": "1",
-     "TS_UPDATE": "1"
-  },
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "slug": "teamspeak",
+  "upstream": "3.13.6",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "3.13.6"
 }
diff --git a/transmission/config.json b/transmission/config.json
index 3322caf99..7415b879e 100644
--- a/transmission/config.json
+++ b/transmission/config.json
@@ -1,5 +1,5 @@
 {
-  "apparmor": "true",
+  "apparmor": true,
   "arch": ["aarch64", "amd64", "armv7", "armhf"],
   "boot": "auto",
   "description": "Bittorrent client based on linuxserver image",
diff --git a/xteve/config.json b/xteve/config.json
index 81d1cb809..fe71573bb 100644
--- a/xteve/config.json
+++ b/xteve/config.json
@@ -1,28 +1,20 @@
 {
-  "name": "Xteve",
-  "version": "2.2.0.200",
-  "upstream": "2.2.0.200",
-  "slug": "xteve",
+  "arch": ["aarch64", "amd64", "armhf", "armv7"],
   "description": "M3U Proxy for Plex DVR and Emby Live TV",
-  "url": "https://github.com/alexbelgium/hassio-addons",
-  "webui": "http://[HOST]:[PORT:34400]/web",
+  "environment": {},
+  "map": ["config:rw", "share:rw"],
+  "name": "Xteve",
+  "options": {},
   "ports": {
     "34400/tcp": 34400
   },
   "ports_description": {
     "34400/tcp": "Web interface"
   },
-  "map": [
-    "config:rw",
-    "share:rw"
-  ],
-  "environment": {},
-  "options": {},
   "schema": {},
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7"
-  ]
+  "slug": "xteve",
+  "upstream": "2.2.0.200",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "2.2.0.200",
+  "webui": "http://[HOST]:[PORT:34400]/web"
 }