diff --git a/addons_updater/config.json b/addons_updater/config.json
index be3065cdb..37e8bf30a 100644
--- a/addons_updater/config.json
+++ b/addons_updater/config.json
@@ -13,16 +13,16 @@
   "image": "ghcr.io/alexbelgium/addons_updater-{arch}",
   "name": "Repository Updater",
   "options": {
-    "repository": "alexbelgium/hassio-addons",
     "gitpass": "gitpassword",
-    "gituser": "gituser"
+    "gituser": "gituser",
+    "repository": "alexbelgium/hassio-addons"
   },
   "schema": {
-    "repository": "str",
     "gitapi": "str?",
     "gitmail": "str?",
     "gitpass": "str",
     "gituser": "str",
+    "repository": "str",
     "verbose": "bool?"
   },
   "slug": "updater",
diff --git a/arpspoof/config.json b/arpspoof/config.json
index dab3ed10b..b9b69f32f 100644
--- a/arpspoof/config.json
+++ b/arpspoof/config.json
@@ -30,4 +30,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/arpsoof",
   "version": "1.0.0",
   "webui": "http://[HOST]:[PORT:7022]"
-}
\ No newline at end of file
+}
diff --git a/bazarr/config.json b/bazarr/config.json
index 94fd1ea94..bf4ed72aa 100644
--- a/bazarr/config.json
+++ b/bazarr/config.json
@@ -81,4 +81,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bazarr",
   "version": "1.0.3",
   "webui": "http://[HOST]:[PORT:6767]"
-}
\ No newline at end of file
+}
diff --git a/booksonic_air/config.json b/booksonic_air/config.json
index bd9158cc0..1f9409a8b 100644
--- a/booksonic_air/config.json
+++ b/booksonic_air/config.json
@@ -77,4 +77,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air",
   "version": "v2201.1.0-ls54",
   "webui": "http://[HOST]:[PORT:4040]"
-}
\ No newline at end of file
+}
diff --git a/calibre/config.json b/calibre/config.json
index f16437fdd..9de5f5411 100644
--- a/calibre/config.json
+++ b/calibre/config.json
@@ -39,11 +39,11 @@
     "/dev/nvme2"
   ],
   "environment": {
-    "PGID": "0",
-    "PUID": "0",
     "CALIBRE_CONFIG_DIRECTORY": "/config/addons_config/calibre",
     "FM_HOME": "/config/addons_config/calibre",
     "HOME": "/config/addons_config/calibre",
+    "PGID": "0",
+    "PUID": "0",
     "shm_size": "1gb"
   },
   "image": "ghcr.io/alexbelgium/calibre-{arch}",
@@ -70,11 +70,11 @@
   },
   "privileged": [],
   "schema": {
+    "CLI_ARGS": "str?",
+    "PASSWORD": "str?",
     "PGID": "int",
     "PUID": "int",
     "TZ": "str?",
-    "PASSWORD": "str?",
-    "CLI_ARGS": "str?",
     "cifspassword": "str?",
     "cifsusername": "str?",
     "localdisks": "str?",
diff --git a/cloudcommander/config.json b/cloudcommander/config.json
index ae8844ffb..9e586945a 100644
--- a/cloudcommander/config.json
+++ b/cloudcommander/config.json
@@ -73,4 +73,4 @@
   "slug": "cloudcommander",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander",
   "version": "16.1.0"
-}
\ No newline at end of file
+}
diff --git a/code-server/config.json b/code-server/config.json
index e80424810..c5ce8236a 100644
--- a/code-server/config.json
+++ b/code-server/config.json
@@ -74,4 +74,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server",
   "version": "4.3.0",
   "webui": "http://[HOST]:[PORT:8443]"
-}
\ No newline at end of file
+}
diff --git a/elasticsearch/config.json b/elasticsearch/config.json
index c61792267..4ff62d671 100644
--- a/elasticsearch/config.json
+++ b/elasticsearch/config.json
@@ -27,4 +27,4 @@
   "slug": "elasticsearch",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/elasticsearch",
   "version": "7.14.2"
-}
\ No newline at end of file
+}
diff --git a/filebrowser/config.json b/filebrowser/config.json
index 3da6a1101..cf7440710 100644
--- a/filebrowser/config.json
+++ b/filebrowser/config.json
@@ -87,4 +87,4 @@
   "startup": "services",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.21.1-2"
-}
\ No newline at end of file
+}
diff --git a/fireflyiii/config.json b/fireflyiii/config.json
index 5b00544f8..e67244dec 100644
--- a/fireflyiii/config.json
+++ b/fireflyiii/config.json
@@ -47,4 +47,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "5.7.2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
-}
\ No newline at end of file
+}
diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json
index 4273ec12e..4f664db15 100644
--- a/fireflyiii_data_importer/config.json
+++ b/fireflyiii_data_importer/config.json
@@ -41,4 +41,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "version-0.9.8",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
-}
\ No newline at end of file
+}
diff --git a/fireflyiii_fints_importer/config.json b/fireflyiii_fints_importer/config.json
index 38c96fcf1..14ae81f3a 100644
--- a/fireflyiii_fints_importer/config.json
+++ b/fireflyiii_fints_importer/config.json
@@ -28,4 +28,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.2-6",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
-}
\ No newline at end of file
+}
diff --git a/flaresolverr/config.json b/flaresolverr/config.json
index a22c6e9f2..9ca9ebced 100644
--- a/flaresolverr/config.json
+++ b/flaresolverr/config.json
@@ -17,4 +17,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.2.4",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]"
-}
\ No newline at end of file
+}
diff --git a/grav/config.json b/grav/config.json
index 0d8130fc3..b93f8bac0 100644
--- a/grav/config.json
+++ b/grav/config.json
@@ -33,4 +33,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.7.33",
   "webui": "http://[HOST]:[PORT:80]"
-}
\ No newline at end of file
+}
diff --git a/inadyn/config.json b/inadyn/config.json
index fd64cd20a..b710bd814 100644
--- a/inadyn/config.json
+++ b/inadyn/config.json
@@ -55,4 +55,4 @@
   "slug": "inadyn",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.9.1-6"
-}
\ No newline at end of file
+}
diff --git a/jellyfin/config.json b/jellyfin/config.json
index fd27016fd..3a167f3b4 100644
--- a/jellyfin/config.json
+++ b/jellyfin/config.json
@@ -103,4 +103,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "10.7.7-1-ls157",
   "video": true
-}
\ No newline at end of file
+}
diff --git a/joal/config.json b/joal/config.json
index c76eaee1e..5c8cbd55d 100644
--- a/joal/config.json
+++ b/joal/config.json
@@ -36,4 +36,4 @@
   "startup": "services",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.1.30"
-}
\ No newline at end of file
+}
diff --git a/lidarr/config.json b/lidarr/config.json
index aadc76eb6..786510b59 100644
--- a/lidarr/config.json
+++ b/lidarr/config.json
@@ -80,4 +80,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md",
   "version": "0.8.1.2135-ls79",
   "webui": "http://[HOST]:[PORT:8686]"
-}
\ No newline at end of file
+}
diff --git a/mealie/config.json b/mealie/config.json
index 9bb3f875b..bada1a272 100644
--- a/mealie/config.json
+++ b/mealie/config.json
@@ -37,4 +37,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "0.5.6",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:9925]"
-}
\ No newline at end of file
+}
diff --git a/mylar3/config.json b/mylar3/config.json
index 2228ca4ad..ecd0534ff 100644
--- a/mylar3/config.json
+++ b/mylar3/config.json
@@ -76,4 +76,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "0.6.7",
   "webui": "http://[HOST]:[PORT:8090]"
-}
\ No newline at end of file
+}
diff --git a/nzbget/config.json b/nzbget/config.json
index 61cdfbc34..929de1304 100644
--- a/nzbget/config.json
+++ b/nzbget/config.json
@@ -76,4 +76,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "21.1",
   "webui": "http://[HOST]:[PORT:6789]"
-}
\ No newline at end of file
+}
diff --git a/ombi/config.json b/ombi/config.json
index 7cd154e97..9876d3518 100644
--- a/ombi/config.json
+++ b/ombi/config.json
@@ -29,4 +29,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/ombi",
   "version": "4.16.12",
   "webui": "http://[HOST]:[PORT:3579]"
-}
\ No newline at end of file
+}
diff --git a/organizr/config.json b/organizr/config.json
index 24bb41f70..89e487f37 100644
--- a/organizr/config.json
+++ b/organizr/config.json
@@ -30,4 +30,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.90",
   "webui": "http://[HOST]:[PORT:80]"
-}
\ No newline at end of file
+}
diff --git a/papermerge/config.json b/papermerge/config.json
index f3f91d6fb..63416d78a 100644
--- a/papermerge/config.json
+++ b/papermerge/config.json
@@ -51,4 +51,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "v2.0.1-ls44",
   "webui": "http://[HOST]:[PORT:8000]"
-}
\ No newline at end of file
+}
diff --git a/piwigo/config.json b/piwigo/config.json
index 1248e883f..fda454cd1 100644
--- a/piwigo/config.json
+++ b/piwigo/config.json
@@ -76,4 +76,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "12.2.0",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
-}
\ No newline at end of file
+}
diff --git a/plex/config.json b/plex/config.json
index 451239f91..d9ab6b760 100644
--- a/plex/config.json
+++ b/plex/config.json
@@ -116,4 +116,4 @@
   "version": "1.26.0.5715-8cf78dab3-ls111",
   "video": true,
   "webui": "http://[HOST]:[PORT:32400]/web"
-}
\ No newline at end of file
+}
diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json
index 8b5753eaf..0286bcb25 100644
--- a/plex_meta_manager/config.json
+++ b/plex_meta_manager/config.json
@@ -34,4 +34,4 @@
   "slug": "plex-meta-manager",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex_meta_manager",
   "version": "v1.16.5-ls11"
-}
\ No newline at end of file
+}
diff --git a/portainer/config.json b/portainer/config.json
index 261b362c7..4cdb86da3 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -46,4 +46,4 @@
   "startup": "services",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.11.1-3"
-}
\ No newline at end of file
+}
diff --git a/prowlarr/config.json b/prowlarr/config.json
index c44d7557e..ffb9f9dd0 100644
--- a/prowlarr/config.json
+++ b/prowlarr/config.json
@@ -48,4 +48,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "nightly-0.3.0.1712-ls323",
   "webui": "http://[HOST]:[PORT:9696]"
-}
\ No newline at end of file
+}
diff --git a/radarr/config.json b/radarr/config.json
index 841bb8560..6b6632fa4 100644
--- a/radarr/config.json
+++ b/radarr/config.json
@@ -81,4 +81,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr",
   "version": "4.1.0.6175",
   "webui": "http://[HOST]:[PORT:7878]"
-}
\ No newline at end of file
+}
diff --git a/requestrr/config.json b/requestrr/config.json
index 2bc70c7a1..fb243c4a6 100644
--- a/requestrr/config.json
+++ b/requestrr/config.json
@@ -35,4 +35,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.1.2",
   "webui": "http://[HOST]:[PORT:4545]"
-}
\ No newline at end of file
+}
diff --git a/resiliosync/config.json b/resiliosync/config.json
index a702b40cb..bddf56873 100644
--- a/resiliosync/config.json
+++ b/resiliosync/config.json
@@ -75,4 +75,4 @@
   "url": "https://github.com/tyjtyj/hassio-addons",
   "version": "2.7.3.1381",
   "webui": "http://[HOST]:[PORT:8888]"
-}
\ No newline at end of file
+}
diff --git a/scrutiny/config.json b/scrutiny/config.json
index fc05ba563..992ea32fd 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -83,4 +83,4 @@
   "udev": true,
   "url": "https://github.com/AnalogJ/scrutiny",
   "version": "0.3.13-7"
-}
\ No newline at end of file
+}
diff --git a/scrutiny_fa/config.json b/scrutiny_fa/config.json
index 06cc8779e..fbfdd65e8 100644
--- a/scrutiny_fa/config.json
+++ b/scrutiny_fa/config.json
@@ -49,4 +49,4 @@
   "startup": "services",
   "url": "https://github.com/AnalogJ/scrutiny",
   "version": "0.3.13-17"
-}
\ No newline at end of file
+}
diff --git a/sonarr/config.json b/sonarr/config.json
index 819af126c..4f5f24213 100644
--- a/sonarr/config.json
+++ b/sonarr/config.json
@@ -81,4 +81,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr",
   "version": "3.0.8.1507",
   "webui": "http://[HOST]:[PORT:8989]"
-}
\ No newline at end of file
+}
diff --git a/spotweb/config.json b/spotweb/config.json
index 27882323a..54470fd07 100644
--- a/spotweb/config.json
+++ b/spotweb/config.json
@@ -47,4 +47,4 @@
   "startup": "services",
   "url": "https://github.com/alexbelgium/hassio-addons/spotweb",
   "version": "1.5.1-7"
-}
\ No newline at end of file
+}
diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json
index 119125c11..5906ca486 100644
--- a/tandoor_recipes/config.json
+++ b/tandoor_recipes/config.json
@@ -43,4 +43,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.1.4",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
-}
\ No newline at end of file
+}
diff --git a/teamspeak/config.json b/teamspeak/config.json
index a384251d1..75b499f76 100644
--- a/teamspeak/config.json
+++ b/teamspeak/config.json
@@ -33,4 +33,4 @@
   "slug": "teamspeak",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "3.13.6"
-}
\ No newline at end of file
+}
diff --git a/ubooquity/config.json b/ubooquity/config.json
index 89e31a6b0..168c4eb2c 100644
--- a/ubooquity/config.json
+++ b/ubooquity/config.json
@@ -86,4 +86,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.1.2-8",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:2206]/ubooquity/admin"
-}
\ No newline at end of file
+}
diff --git a/webtop_kde/config.json b/webtop_kde/config.json
index 0fa6f9984..fc08629a4 100644
--- a/webtop_kde/config.json
+++ b/webtop_kde/config.json
@@ -111,4 +111,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "4.16-r0-ls53",
   "video": true
-}
\ No newline at end of file
+}
diff --git a/wger/config.json b/wger/config.json
index 1ded62728..2df699a11 100644
--- a/wger/config.json
+++ b/wger/config.json
@@ -24,4 +24,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.9-2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8000]"
-}
\ No newline at end of file
+}
diff --git a/whoogle/config.json b/whoogle/config.json
index 0c762bc78..bab8f9eb6 100644
--- a/whoogle/config.json
+++ b/whoogle/config.json
@@ -59,4 +59,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/whoogle",
   "version": "0.7.2",
   "webui": "http://[HOST]:[PORT:5000]"
-}
\ No newline at end of file
+}
diff --git a/xteve/config.json b/xteve/config.json
index 4e19780d5..6df890f46 100644
--- a/xteve/config.json
+++ b/xteve/config.json
@@ -21,4 +21,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.2.0.200",
   "webui": "http://[HOST]:[PORT:34400]/web"
-}
\ No newline at end of file
+}
diff --git a/zoneminder/config.json b/zoneminder/config.json
index 85811a7a2..d921c06b1 100644
--- a/zoneminder/config.json
+++ b/zoneminder/config.json
@@ -27,4 +27,4 @@
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "1.36.14-2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm"
-}
\ No newline at end of file
+}