diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 10ef7e8b9..7e6f077d2 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
@@ -18,6 +19,7 @@ RUN \
     smbclient \
     || apk add --no-cache \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index d10331b5e..31aa035c8 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
@@ -27,9 +28,9 @@ RUN \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/bashio
 
-    #################
-    # Correct image #
-    #################
+#################
+# Correct image #
+#################
 RUN \
     # Allow UID and GID setting
     sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index c3b734dc1..28771267a 100644
--- a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apt-get update
         apt-get install -y --no-install-recommends \
         jq \
+        yq \
         cifs-utils \ 
         keyutils \
         samba \
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index f68c737b4..6e39bcc26 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -10,6 +10,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     cifs-utils \    
     keyutils \
     samba \
diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
index e48d595e8..c8389c44f 100644
--- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
             apt-get update &&
             apt-get install -y --no-install-recommends \
         jq \
+        yq \
         cifs-utils \ 
         keyutils \
         samba \
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index de446ba09..1d20ce1da 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     ##################
     # Install bashio #
     ##################
diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile
index 6fc51b6e1..6fa0954c9 100644
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     samba \
     smbclient \
     ##################
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 81abc0e48..0ecfe78f6 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -15,6 +15,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     cifs-utils \
     keyutils \
     samba \
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index d4679c92e..4908061f4 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -16,6 +16,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     yamllint \
     && apt-get clean \
diff --git a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
index a796e90c3..ed48dc4d0 100644
--- a/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/enedisgateway2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -12,6 +12,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apt-get update
         apt-get install -yq --no-install-recommends \
         jq \
+        yq \
         curl \
         yamllint
 
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index 08e8e3986..4fbf20d24 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -16,6 +16,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     yamllint \
     && apt-get clean \
diff --git a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 033253f6b..2feb75526 100644
--- a/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/enedisgateway2mqtt_dev/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -10,8 +10,9 @@ if [ ! -f "/usr/bin/bashio" ]; then
         ################
         apt-get clean &&
             apt-get update &&
-            apt-get install -yq --no-install-recommends \
+            apt-get install --no-install-recommends \
         jq \
+        yq \
         curl \
         yamllint
 
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 51b4742cd..54ada6eb2 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -10,6 +10,7 @@ RUN \
     apk add --no-cache \
     curl \
     jq \
+    yq \
     bash \
     cifs-utils \
     keyutils \
diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
index f8f3be2a8..16a7857f6 100644
--- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apk add --no-cache \
         curl \
         jq \
+        yq \
         bash \
         cifs-utils \
         keyutils \
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index a2ab0c520..78d32a5cd 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -9,6 +9,7 @@ RUN \
     ##################
     apk add --no-cache \
     jq \
+    yq \
     curl \
     cifs-utils \
     \
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index f1a7d19ff..8053780a6 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -15,6 +15,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     yamllint \
     && apt-get clean \
diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 0ae87922d..33a57a23f 100644
--- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
             apt-get update &&
             apt-get install -y --no-install-recommends \
         jq \
+        yq \
         curl \
         yamllint
 
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 53f102405..041dfbfc1 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -11,12 +11,14 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
     samba \
     smbclient || apk add --no-cache \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index ad8a699a0..4476f650a 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -14,10 +14,11 @@ RUN \
     # Install apps #
     ################
     apk add --no-cache \
-      curl \
-      jq \
-      bash \
-      xz build-base libressl-dev ca-certificates npm \
+    curl \
+    jq \
+    yq \
+    bash \
+    xz build-base libressl-dev ca-certificates npm \
     \
     ##################
     # Install bashio #
@@ -33,9 +34,9 @@ RUN \
     # Install mustache #
     ####################
     && apk add --no-cache \
-        go \
-        npm \
-#    && npm install mustache-cli --global        
+    go \
+    npm \
+    #    && npm install mustache-cli --global        
     && apk upgrade --no-cache &&\
     apk add --no-cache --virtual .build-deps\
     build-base\
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 3d3cf7d89..f23588cea 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update \
     \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     samba \
     smbclient \
     \
diff --git a/jellyfin_test/Dockerfile b/jellyfin_test/Dockerfile
index 6cb240ec8..dae19ff4a 100644
--- a/jellyfin_test/Dockerfile
+++ b/jellyfin_test/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update \
     \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     samba \
     smbclient \
     nginx \
diff --git a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index bee0d296e..3de165801 100644
--- a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apt-get update
         apt-get install -y --no-install-recommends \
         jq \
+        yq \
         samba \
         smbclient \
         nginx
diff --git a/joal/Dockerfile b/joal/Dockerfile
index b2755113d..9e31bf0cc 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -16,6 +16,7 @@ RUN \
     && apt-get install -y --no-install-recommends \
     wget \
     jq \
+    yq \
     nginx \
     ##################
     # Install bashio #
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 4e5d3643b..a526b8d6b 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -11,9 +11,10 @@ RUN \
     apt-get clean \
     && apt-get update \     
     && apt-get install -y \
-         jq \
-         curl \
-#         nginx \
+    jq \
+    yq \
+    curl \
+    #         nginx \
     \
     ##################
     # Install bashio #
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index 79993ab4a..68b990c50 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 40eed4cbc..d5868e1ac 100644
--- a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apk update &&
             apk add --no-cache \
         jq \
+        yq \
         curl \
         cifs-utils \
         keyutils \
@@ -19,6 +20,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
                     apt-get update &&
                     apt-get install -y --no-install-recommends \
                 jq \
+                yq \
                 curl \
                 cifs-utils \
                 keyutils \
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 253dd9783..51635b1ff 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     curl \
     # Backup if change
     || apk add --no-cache jq curl \
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 155fc98eb..458a9578a 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -4,37 +4,38 @@ FROM ${BUILD_FROM}
 ARG BASHIO_VERSION=0.13.1
 
 RUN \
-    ################
-    # Install apps #
-    ################
-    apk add --no-cache \
-      curl \
-      jq \
-    \
-    ###################
-    # Install bashio #
-    ##################
-    && mkdir -p /tmp/bashio \
-    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
-    | tar -xzf - --strip 1 -C /tmp/bashio \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio \
-    \
-    ########################################
-    # Correct upstream image folders links #
-    ########################################
-    \
-    # Allow UID and GID setting
-    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-    \
-    # Allow custom config folder
-    && grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
-    && grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
-    && grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
-    && grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
+  ################
+  # Install apps #
+  ################
+  apk add --no-cache \
+  curl \
+  jq \
+  yq \
+  \
+  ###################
+  # Install bashio #
+  ##################
+  && mkdir -p /tmp/bashio \
+  && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
+  | tar -xzf - --strip 1 -C /tmp/bashio \
+  && mv /tmp/bashio/lib /usr/lib/bashio \
+  && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+  && rm -rf /tmp/bashio \
+  \
+  ########################################
+  # Correct upstream image folders links #
+  ########################################
+  \
+  # Allow UID and GID setting
+  && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+  && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+  && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
+  \
+  # Allow custom config folder
+  && grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
+  && grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
+  && grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
+  && grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
 
 # copy local files
 COPY root/ /
@@ -48,20 +49,20 @@ ARG BUILD_REF
 ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
 LABEL \
-    io.hass.name="${BUILD_NAME}" \
-    io.hass.description="${BUILD_DESCRIPTION}" \
-    io.hass.arch="${BUILD_ARCH}" \
-    io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION} \
-    maintainer="alexbelgium (https://github.com/alexbelgium)" \
-    org.opencontainers.image.title="${BUILD_NAME}" \
-    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
-    org.opencontainers.image.vendor="Home Assistant Add-ons" \
-    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
-    org.opencontainers.image.licenses="MIT" \
-    org.opencontainers.image.url="https://github.com/alexbelgium" \
-    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
-    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
-    org.opencontainers.image.created=${BUILD_DATE} \
-    org.opencontainers.image.revision=${BUILD_REF} \
-    org.opencontainers.image.version=${BUILD_VERSION}
+  io.hass.name="${BUILD_NAME}" \
+  io.hass.description="${BUILD_DESCRIPTION}" \
+  io.hass.arch="${BUILD_ARCH}" \
+  io.hass.type="addon" \
+  io.hass.version=${BUILD_VERSION} \
+  maintainer="alexbelgium (https://github.com/alexbelgium)" \
+  org.opencontainers.image.title="${BUILD_NAME}" \
+  org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+  org.opencontainers.image.vendor="Home Assistant Add-ons" \
+  org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+  org.opencontainers.image.licenses="MIT" \
+  org.opencontainers.image.url="https://github.com/alexbelgium" \
+  org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+  org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+  org.opencontainers.image.created=${BUILD_DATE} \
+  org.opencontainers.image.revision=${BUILD_REF} \
+  org.opencontainers.image.version=${BUILD_VERSION}
diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile
index c742bd7ad..a1ea77804 100644
--- a/paperless_ng/Dockerfile
+++ b/paperless_ng/Dockerfile
@@ -8,16 +8,17 @@ ENV PAPERLESS_DATA_DIR=/config/paperless_ng
 
 RUN apt-get update && \
     \
-       apt-get clean && \
-       apt-get update && \
-       apt-get install -y --no-install-recommends \
-                jq \
-                curl \
-                cifs-utils \
-                keyutils \
-                smbclient \
-                samba \
-                yamllint \
+    apt-get clean && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    jq \
+    yq \
+    curl \
+    cifs-utils \
+    keyutils \
+    smbclient \
+    samba \
+    yamllint \
     \
     ##################
     # Install bashio #
diff --git a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 96ffcbaf0..0e0b2a4b1 100644
--- a/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/paperless_ng/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -6,18 +6,18 @@ if [ ! -f "/usr/bin/bashio" ]; then
         ################
         # Install apps #
         ################
-        
-                apt-get clean &&
-                    apt-get update &&
-                    apt-get install -y --no-install-recommends \
-                jq \
-                curl \
-                cifs-utils \
-                keyutils \
-                smbclient \
-                samba \
-                yamllint
-           
+
+        apt-get clean &&
+            apt-get update &&
+            apt-get install -y --no-install-recommends \
+        jq \
+        yq \
+        curl \
+        cifs-utils \
+        keyutils \
+        smbclient \
+        samba \
+        yamllint
 
         ###################
         # Install bashio #
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 136bc1320..c5f6d3a26 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -13,6 +13,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index 2fef82c60..ae859ab25 100644
--- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
             apt-get update &&
             apt-get install -y --no-install-recommends \
         jq \
+        yq \
         curl \
         cifs-utils \
         keyutils \
@@ -18,6 +19,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
             apk update &&
             apk add --no-cache \
         jq \
+        yq \
         curl \
         cifs-utils \
         keyutils \
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index 26fe9e3e7..5d7738e19 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -16,6 +16,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index ad726c0bb..5430f8601 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -12,6 +12,7 @@ RUN \
     # Install bashio
     apk add --no-cache \
     jq \
+    yq \
     curl \
     cifs-utils \
     \
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 83df1211e..b6f42c50a 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -17,6 +17,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     cifs-utils \
     keyutils \
     samba \
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index e585c007f..5daaf87e0 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 074646a31..b97bba366 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -15,6 +15,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
index dd2e31c50..79dcc7424 100644
--- a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -11,6 +11,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apt-get update \
         apt-get install -y \
         jq \
+        yq \
         curl \
         cifs-utils \
         keyutils \
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index d6ca5a3e4..9c64a574e 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 353eae168..f74d6cbd9 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 7a8153e9a..df6a87133 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index f76243d3e..30d1328b9 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -11,6 +11,7 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 31c558cc9..2393a1d28 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -11,19 +11,20 @@ ARG TEMPIO_VERSION=2021.01.0
 ARG BUILD_ARCH
 
 RUN \
-# Install script
+    # Install script
     chmod a+x /run.sh \
     \
-# Add apps
+    # Add apps
     && apk add --no-cache \
     jq \
+    yq \
     curl \
     cifs-utils \
     nginx \
     \
-# Install tempio
+    # Install tempio
     && curl -L -f -s -o /usr/bin/tempio \
-        "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
+    "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/tempio \
     \
     ##################
@@ -36,22 +37,22 @@ RUN \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/bashio \
     \
-# Allow UID and GID setting
+    # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-# Correct visualization bug on mobile
-#    && sed -i 's|content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0"|content="width=980, initial-scale=1.0"|g' /app/scrutiny-web/index.html \
-# use /data instead of /config for database
+    # Correct visualization bug on mobile
+    #    && sed -i 's|content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0"|content="width=980, initial-scale=1.0"|g' /app/scrutiny-web/index.html \
+    # use /data instead of /config for database
     && sed -i 's| /config| /data|g' /defaults/scrutiny.yaml \
     && sed -i 's| /config| /data|g' /etc/cont-init.d/* \
     && sed -i 's| /config| /data|g' /etc/logrotate.d/scrutiny \
     && sed -i 's| /config| /data|g' /etc/crontabs/root \
-# analyse local devices at reboot
-#   && sed -i '$d' /etc/crontabs/root \
-#   && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
-#   && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
-# correct url paths  
+    # analyse local devices at reboot
+    #   && sed -i '$d' /etc/crontabs/root \
+    #   && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
+    #   && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
+    # correct url paths  
     && grep -rl '/web/' /app/scrutiny-web/ | xargs sed -i 's|/web/|./|g'
 
 VOLUME [ "/data" ]
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index c7fbfc726..b688b7d0a 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -12,6 +12,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     cifs-utils \
     keyutils \
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 564d0682b..b9586b338 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
 RUN apk add --no-cache \
     curl \
     jq \
+    yq \
     samba \
     samba-client \
     && curl -J -L -o /tmp/bashio.tar.gz \
@@ -24,7 +25,7 @@ RUN apk add --no-cache \
     ln -s /usr/share/transmission/web/images /transmission-web-control && \
     ln -s /usr/share/transmission/web/javascript /transmission-web-control && \
     ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html
- 
+
 
 # Copy root filesystem
 COPY rootfs /
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 846ee5c4b..11081ea6d 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -8,6 +8,7 @@ ARG BASHIO_VERSION=0.13.1
 RUN apk add --no-cache \
     curl \
     jq \
+    yq \
     moreutils \
     samba \
     nginx \
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 3fdbc949a..1bdca28d6 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -15,6 +15,7 @@ RUN \
     && apt-get update \
     && apt-get install -y \
     jq \
+    yq \
     curl \
     yamllint \
     && apt-get clean \
diff --git a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
index 9072c020e..e836ba324 100644
--- a/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
+++ b/webtrees/rootfs/scripts/00-aaa_dockerfile_backup.sh
@@ -10,7 +10,8 @@ if [ ! -f "/usr/bin/bashio" ]; then
         apt-get update
         apt-get install -y \
         jq \
-           yamllint \
+        yq \
+        yamllint \
         curl &&
             apt-get clean