diff --git a/3.0/apache/Dockerfile b/3.0/apache/Dockerfile
index 5701efe..391b52a 100644
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -85,7 +86,7 @@ ARG USER=root
 ARG LISTEN_PORT=80
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
 RUN set -ex; \
         curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
diff --git a/3.0/fpm-alpine/Dockerfile b/3.0/fpm-alpine/Dockerfile
index 5b2f4ee..ea4c46b 100644
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
 RUN apk add --no-cache netcat-openbsd bash
 
 # Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
             | sort -u \
             | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
     )"; \
-    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
     apk del --no-cache --no-network .build-deps
 
 ARG version="3.28.56+230404"
diff --git a/3.0/fpm/Dockerfile b/3.0/fpm/Dockerfile
index ff36e31..82af8bd 100644
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -70,7 +71,7 @@ ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
 RUN set -ex; \
         curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
diff --git a/5.0/apache/Dockerfile b/5.0/apache/Dockerfile
index aa56c33..184d4db 100644
--- a/5.0/apache/Dockerfile
+++ b/5.0/apache/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -85,7 +86,7 @@ ARG USER=www-data
 ARG LISTEN_PORT=8080
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
 RUN set -ex; \
         curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
diff --git a/5.0/fpm-alpine/Dockerfile b/5.0/fpm-alpine/Dockerfile
index 903e299..25e51c4 100644
--- a/5.0/fpm-alpine/Dockerfile
+++ b/5.0/fpm-alpine/Dockerfile
@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
 RUN apk add --no-cache netcat-openbsd bash
 
 # Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
             | sort -u \
             | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
     )"; \
-    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
     apk del --no-cache --no-network .build-deps
 
 ARG version="5.6.21+230518"
diff --git a/5.0/fpm/Dockerfile b/5.0/fpm/Dockerfile
index 2eda577..3791b2c 100644
--- a/5.0/fpm/Dockerfile
+++ b/5.0/fpm/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
@@ -71,7 +72,7 @@ ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
 
-# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository) 
+# Download, unzip and chmod LimeSurvey from GitHub (defaults to the official LimeSurvey/LimeSurvey repository)
 RUN set -ex; \
         curl -sSL "${archive_url}" --output /tmp/limesurvey.tar.gz && \
         echo "${sha256_checksum}  /tmp/limesurvey.tar.gz" | sha256sum -c - && \
diff --git a/6.0/apache/Dockerfile b/6.0/apache/Dockerfile
index 9221944..4d3b9ca 100644
--- a/6.0/apache/Dockerfile
+++ b/6.0/apache/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
diff --git a/6.0/fpm-alpine/Dockerfile b/6.0/fpm-alpine/Dockerfile
index 73fd2f7..81bd50e 100644
--- a/6.0/fpm-alpine/Dockerfile
+++ b/6.0/fpm-alpine/Dockerfile
@@ -5,6 +5,7 @@ LABEL maintainer="markus@martialblog.de"
 RUN apk add --no-cache netcat-openbsd bash
 
 # Install PHP Plugins
+# hadolint ignore=SC2086
 RUN set -ex; \
         apk add --no-cache --virtual .build-deps \
         freetype-dev \
@@ -42,7 +43,7 @@ RUN set -ex; \
             | sort -u \
             | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
     )"; \
-    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps "${runDeps}"; \
+    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
     apk del --no-cache --no-network .build-deps
 
 ARG version="6.0.7+230515"
diff --git a/6.0/fpm/Dockerfile b/6.0/fpm/Dockerfile
index 39097d5..991f909 100644
--- a/6.0/fpm/Dockerfile
+++ b/6.0/fpm/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
         rm -rf /var/lib/apt/lists/*
 
 # Install PHP Plugins and Configure PHP imap plugin
+# hadolint ignore=SC2086
 RUN set -ex; \
         \
         savedAptMark="$(apt-mark showmanual)"; \
@@ -51,7 +52,7 @@ RUN set -ex; \
                 zip \
         ; \
         \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# Reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
         apt-mark auto '.*' > /dev/null; \
         apt-mark manual $savedAptMark; \
         ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \