diff --git a/addons_updater/config.json b/addons_updater/config.json
index 323d2fdc9..2aeb5ff17 100644
--- a/addons_updater/config.json
+++ b/addons_updater/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/arpspoof/config.json b/arpspoof/config.json
index b467876d3..a7d23ab9a 100644
--- a/arpspoof/config.json
+++ b/arpspoof/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 5e76a6647..df0282312 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/bazarr/config.json b/bazarr/config.json
index 41cdd6851..46d5b6e86 100644
--- a/bazarr/config.json
+++ b/bazarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/bitwarden/config.json b/bitwarden/config.json
index 44ba32305..b9b6bad5e 100644
--- a/bitwarden/config.json
+++ b/bitwarden/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 4d5661f30..e7d501f47 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -36,15 +36,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/booksonic_air/config.json b/booksonic_air/config.json
index 922a4ef87..7b7ff98df 100644
--- a/booksonic_air/config.json
+++ b/booksonic_air/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 0ad033d23..2c05aa3ab 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/calibre/config.json b/calibre/config.json
index 7a92d3414..7a78d62a1 100644
--- a/calibre/config.json
+++ b/calibre/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index e89d7f5be..bdad8b76b 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/calibre_web/config.json b/calibre_web/config.json
index b028d38a2..4239fa874 100644
--- a/calibre_web/config.json
+++ b/calibre_web/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/cloudcommander/config.json b/cloudcommander/config.json
index cf95850fd..c2927ec24 100644
--- a/cloudcommander/config.json
+++ b/cloudcommander/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index d5015f441..bf947a7c6 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/code-server/config.json b/code-server/config.json
index 1212b7d04..59d784f14 100644
--- a/code-server/config.json
+++ b/code-server/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/elasticsearch/config.json b/elasticsearch/config.json
index 473da5198..46ec51a15 100644
--- a/elasticsearch/config.json
+++ b/elasticsearch/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 348e422c3..ce590f92b 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/emby/config.json b/emby/config.json
index a3b6d1bf1..61e09c663 100644
--- a/emby/config.json
+++ b/emby/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/enedisgateway2mqtt/config.json b/enedisgateway2mqtt/config.json
index 69ce38ea6..fd26af261 100644
--- a/enedisgateway2mqtt/config.json
+++ b/enedisgateway2mqtt/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/enedisgateway2mqtt_dev/config.json b/enedisgateway2mqtt_dev/config.json
index 06859abb6..75c259bcf 100644
--- a/enedisgateway2mqtt_dev/config.json
+++ b/enedisgateway2mqtt_dev/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json
index 9bf1c357f..a68116d61 100644
--- a/epicgamesfree/config.json
+++ b/epicgamesfree/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/filebrowser/config.json b/filebrowser/config.json
index ca215bf6f..5a3928fd2 100644
--- a/filebrowser/config.json
+++ b/filebrowser/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/fireflyiii/config.json b/fireflyiii/config.json
index 343a37bcf..81a5033b5 100644
--- a/fireflyiii/config.json
+++ b/fireflyiii/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json
index b56493be9..a20b06ea4 100644
--- a/fireflyiii_data_importer/config.json
+++ b/fireflyiii_data_importer/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/fireflyiii_fints_importer/config.json b/fireflyiii_fints_importer/config.json
index 38c96fcf1..14ad47b5d 100644
--- a/fireflyiii_fints_importer/config.json
+++ b/fireflyiii_fints_importer/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "amd64"
   ],
   "codenotary": "alexandrep.github@gmail.com",
diff --git a/flaresolverr/config.json b/flaresolverr/config.json
index fb589b901..762c818f8 100644
--- a/flaresolverr/config.json
+++ b/flaresolverr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 47a4513b9..3663a06cd 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -44,15 +44,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/flexget/config.json b/flexget/config.json
index 20293455e..f6b76d320 100644
--- a/flexget/config.json
+++ b/flexget/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/gazpar2mqtt/config.json b/gazpar2mqtt/config.json
index 8c2734ab4..b0bc7fd67 100644
--- a/gazpar2mqtt/config.json
+++ b/gazpar2mqtt/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/gitea/config.json b/gitea/config.json
index ab67e6cb5..e68c5a4ba 100644
--- a/gitea/config.json
+++ b/gitea/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 08cf26043..e9fef5e1c 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/grav/config.json b/grav/config.json
index 07cd18cda..ac69732f4 100644
--- a/grav/config.json
+++ b/grav/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/guacamole/config.json b/guacamole/config.json
index 3d4c3fd3a..2871e481c 100644
--- a/guacamole/config.json
+++ b/guacamole/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "amd64",
     "aarch64"
   ],
diff --git a/inadyn/config.json b/inadyn/config.json
index fd64cd20a..225a7d643 100644
--- a/inadyn/config.json
+++ b/inadyn/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index f21869f36..48b3674b2 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/jackett/config.json b/jackett/config.json
index 764f1fc1c..2e04b80aa 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index ef8aa1163..a5c2561d1 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/jellyfin/config.json b/jellyfin/config.json
index cc79223d0..9f50f8af8 100644
--- a/jellyfin/config.json
+++ b/jellyfin/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/joal/config.json b/joal/config.json
index de22f0158..a8105c688 100644
--- a/joal/config.json
+++ b/joal/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/joplin/config.json b/joplin/config.json
index 0fe44ebc5..94f14f133 100644
--- a/joplin/config.json
+++ b/joplin/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index 3b4bd5af0..361f1baec 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/lidarr/config.json b/lidarr/config.json
index b77c7db29..b730566a8 100644
--- a/lidarr/config.json
+++ b/lidarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/mealie/config.json b/mealie/config.json
index c2d65152e..74598d001 100644
--- a/mealie/config.json
+++ b/mealie/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 77a0153f5..4caa44378 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/mylar3/config.json b/mylar3/config.json
index b9ef355c3..2c8b220f0 100644
--- a/mylar3/config.json
+++ b/mylar3/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/nextcloud/config.json b/nextcloud/config.json
index bdb14d7f4..f71815ed2 100644
--- a/nextcloud/config.json
+++ b/nextcloud/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 799dce5c5..edd12f4ab 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -38,15 +38,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/nzbget/config.json b/nzbget/config.json
index faed00e7a..3566fbb40 100644
--- a/nzbget/config.json
+++ b/nzbget/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/omada/config.json b/omada/config.json
index e4189215b..1f1e680d8 100644
--- a/omada/config.json
+++ b/omada/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 0a498db03..93cff4109 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/ombi/config.json b/ombi/config.json
index ac5c826f1..d35c0bbe8 100644
--- a/ombi/config.json
+++ b/ombi/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index fd1881d38..fe4437aa8 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -33,15 +33,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/organizr/config.json b/organizr/config.json
index c09540850..366f63f46 100644
--- a/organizr/config.json
+++ b/organizr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 2a0eb0863..375c7c8ea 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/overseerr/config.json b/overseerr/config.json
index fe0c90da4..d2b3adea5 100644
--- a/overseerr/config.json
+++ b/overseerr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index e27fb2fa3..2b8806aff 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index dfd0855e8..2366f62d8 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index e923f189c..359a8f08a 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -41,15 +41,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/papermerge/config.json b/papermerge/config.json
index c4ea8fc5b..c2f1844a3 100644
--- a/papermerge/config.json
+++ b/papermerge/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/photoprism/config.json b/photoprism/config.json
index d542ebc8b..981bfeb05 100644
--- a/photoprism/config.json
+++ b/photoprism/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 0d2670074..5a5cc932d 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/piwigo/config.json b/piwigo/config.json
index 452b4b115..f07f7a042 100644
--- a/piwigo/config.json
+++ b/piwigo/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 4fbffb2f6..94b9e8a94 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -43,15 +43,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/plex/config.json b/plex/config.json
index fb0899ba5..f7447f1c0 100644
--- a/plex/config.json
+++ b/plex/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index bebbe645a..2c182c17b 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -42,15 +42,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json
index af6983f09..a35e05fc8 100644
--- a/plex_meta_manager/config.json
+++ b/plex_meta_manager/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/portainer/config.json b/portainer/config.json
index 8ddd34e26..11652a300 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 0916858fb..45c720c80 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/prowlarr/config.json b/prowlarr/config.json
index b2f0d8f41..526af94df 100644
--- a/prowlarr/config.json
+++ b/prowlarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index ebb491282..2c2ae427b 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -57,15 +57,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done \
     \
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
index 333c7b128..296f51b50 100644
--- a/qbittorrent/config.json
+++ b/qbittorrent/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 8cd5235b4..7ff847d03 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/radarr/config.json b/radarr/config.json
index ce499f234..4e2a96467 100644
--- a/radarr/config.json
+++ b/radarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 51a10f79f..040fcdcbf 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/readarr/config.json b/readarr/config.json
index f0e75e582..9ed1550e4 100644
--- a/readarr/config.json
+++ b/readarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index bb6bb301d..827e94d64 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/requestrr/config.json b/requestrr/config.json
index 017a40378..4df99d499 100644
--- a/requestrr/config.json
+++ b/requestrr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index a32e40402..a7287dbc1 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -46,15 +46,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/resiliosync/config.json b/resiliosync/config.json
index 91f6d46c1..f45297756 100644
--- a/resiliosync/config.json
+++ b/resiliosync/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/scrutiny/config.json b/scrutiny/config.json
index f802389f4..de502c039 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": "true",
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/scrutiny_fa/config.json b/scrutiny_fa/config.json
index 1972c43e7..0aea4173e 100644
--- a/scrutiny_fa/config.json
+++ b/scrutiny_fa/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": "true",
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64"
   ],
diff --git a/seafile/config.json b/seafile/config.json
index b89b3b90c..4ccaaf4c9 100644
--- a/seafile/config.json
+++ b/seafile/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 157444595..04a871c6a 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -35,15 +35,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/sonarr/config.json b/sonarr/config.json
index 20189f40e..c0886457e 100644
--- a/sonarr/config.json
+++ b/sonarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/spotweb/config.json b/spotweb/config.json
index cb01801fa..38238f4ff 100644
--- a/spotweb/config.json
+++ b/spotweb/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json
index fe5a4a349..a3b16936f 100644
--- a/tandoor_recipes/config.json
+++ b/tandoor_recipes/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/tdarr/config.json b/tdarr/config.json
index fcc960fee..ff52f62ff 100644
--- a/tdarr/config.json
+++ b/tdarr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/teamspeak/config.json b/teamspeak/config.json
index f10338847..1452e5da9 100644
--- a/teamspeak/config.json
+++ b/teamspeak/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 2c0c26d7a..a20e93ef4 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -34,15 +34,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/transmission/config.json b/transmission/config.json
index 9ad962dca..96dc6c6df 100644
--- a/transmission/config.json
+++ b/transmission/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/transmission_openvpn/config.json b/transmission_openvpn/config.json
index df65889b4..3eae8f889 100644
--- a/transmission_openvpn/config.json
+++ b/transmission_openvpn/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 49458a979..491262785 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -44,15 +44,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/ubooquity/config.json b/ubooquity/config.json
index 00e1f5707..26c91d798 100644
--- a/ubooquity/config.json
+++ b/ubooquity/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/unpackerr/config.json b/unpackerr/config.json
index 5538826d9..0b5d63b53 100644
--- a/unpackerr/config.json
+++ b/unpackerr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index 5ca91ef67..51a034cf1 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -47,15 +47,15 @@ RUN \
     # Avoid custom-init.d duplications
     for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
     \
+    # Create new config folder if needed
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
+    \
     # Allow UID and GID setting
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID' ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID' ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
+    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' "$file" && sed -i '1a PUID="$(if [ -n $(bashio::config 'PUID') ]; then echo "0"; else bashio::config 'PUID'; fi)"' "$file" && sed -i '1a PGID="$(if [ -n $(bashio::config 'PGID') ]; then echo "0"; else bashio::config 'PGID'; fi)"' "$file"; done \
     \
     # Correct config location
     && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \
     \
-    # Create new config folder if needed
-    && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" "$file"; done \
-    \
     # Avoid chmod /config
     && for files in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $files ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' "$files") ]] ; then sed -i "s|/config$|/data|g" "$files"; fi ;done
 
diff --git a/webtop_kde/config.json b/webtop_kde/config.json
index 0cd3cbee6..ce797ef90 100644
--- a/webtop_kde/config.json
+++ b/webtop_kde/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/webtrees/config.json b/webtrees/config.json
index 2b891b94d..95cad9ee3 100644
--- a/webtrees/config.json
+++ b/webtrees/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/whoogle/config.json b/whoogle/config.json
index 8decc1b9a..b9a7d0604 100644
--- a/whoogle/config.json
+++ b/whoogle/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/xteve/config.json b/xteve/config.json
index d2245033e..becfffb90 100644
--- a/xteve/config.json
+++ b/xteve/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"
diff --git a/zoneminder/config.json b/zoneminder/config.json
index 505a7f484..1275963cf 100644
--- a/zoneminder/config.json
+++ b/zoneminder/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": [
+  "arch2": [
     "aarch64",
     "amd64",
     "armv7"