diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile
index d10b6b3..2191133 100644
--- a/2021.09/apache/Dockerfile
+++ b/2021.09/apache/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile
index df75eaa..6d5668a 100644
--- a/2021.09/fpm-alpine/Dockerfile
+++ b/2021.09/fpm-alpine/Dockerfile
@@ -120,9 +120,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile
index 0421b17..a687f81 100644
--- a/2021.09/fpm/Dockerfile
+++ b/2021.09/fpm/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.02/apache/Dockerfile b/2022.02/apache/Dockerfile
index 60a0b8e..73f2ed2 100644
--- a/2022.02/apache/Dockerfile
+++ b/2022.02/apache/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.02/fpm-alpine/Dockerfile b/2022.02/fpm-alpine/Dockerfile
index 3862c63..f0e1038 100644
--- a/2022.02/fpm-alpine/Dockerfile
+++ b/2022.02/fpm-alpine/Dockerfile
@@ -120,9 +120,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.02/fpm/Dockerfile b/2022.02/fpm/Dockerfile
index bb581e5..de49d15 100644
--- a/2022.02/fpm/Dockerfile
+++ b/2022.02/fpm/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.05-dev/apache/Dockerfile b/2022.05-dev/apache/Dockerfile
index db618f1..6bc2e83 100644
--- a/2022.05-dev/apache/Dockerfile
+++ b/2022.05-dev/apache/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.05-dev/fpm-alpine/Dockerfile b/2022.05-dev/fpm-alpine/Dockerfile
index 2a9d914..2969104 100644
--- a/2022.05-dev/fpm-alpine/Dockerfile
+++ b/2022.05-dev/fpm-alpine/Dockerfile
@@ -120,9 +120,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/2022.05-dev/fpm/Dockerfile b/2022.05-dev/fpm/Dockerfile
index 8a6917e..2550d35 100644
--- a/2022.05-dev/fpm/Dockerfile
+++ b/2022.05-dev/fpm/Dockerfile
@@ -139,9 +139,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index f7fbc2d..56617b9 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -119,9 +119,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8e32e3b..c68cd37 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -138,9 +138,9 @@ RUN set -ex; \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
     { \
-        echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
-        echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
-        echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
+        echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
+        echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
+        echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
     } > /usr/local/etc/php/conf.d/friendica.ini; \
     \
     mkdir /var/www/data; \