diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile
index 2191133..d10b6b3 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/apache/entrypoint.sh b/2021.09/apache/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2021.09/apache/entrypoint.sh
+++ b/2021.09/apache/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile
index 6d5668a..df75eaa 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-alpine/entrypoint.sh b/2021.09/fpm-alpine/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2021.09/fpm-alpine/entrypoint.sh
+++ b/2021.09/fpm-alpine/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile
index a687f81..0421b17 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/2021.09/fpm/entrypoint.sh b/2021.09/fpm/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2021.09/fpm/entrypoint.sh
+++ b/2021.09/fpm/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.02/apache/Dockerfile b/2022.02/apache/Dockerfile
index 73f2ed2..60a0b8e 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/apache/entrypoint.sh b/2022.02/apache/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.02/apache/entrypoint.sh
+++ b/2022.02/apache/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.02/fpm-alpine/Dockerfile b/2022.02/fpm-alpine/Dockerfile
index f0e1038..3862c63 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-alpine/entrypoint.sh b/2022.02/fpm-alpine/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.02/fpm-alpine/entrypoint.sh
+++ b/2022.02/fpm-alpine/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.02/fpm/Dockerfile b/2022.02/fpm/Dockerfile
index de49d15..bb581e5 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.02/fpm/entrypoint.sh b/2022.02/fpm/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.02/fpm/entrypoint.sh
+++ b/2022.02/fpm/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.05-dev/apache/Dockerfile b/2022.05-dev/apache/Dockerfile
index 6bc2e83..db618f1 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/apache/entrypoint.sh b/2022.05-dev/apache/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.05-dev/apache/entrypoint.sh
+++ b/2022.05-dev/apache/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.05-dev/fpm-alpine/Dockerfile b/2022.05-dev/fpm-alpine/Dockerfile
index 2969104..2a9d914 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-alpine/entrypoint.sh b/2022.05-dev/fpm-alpine/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.05-dev/fpm-alpine/entrypoint.sh
+++ b/2022.05-dev/fpm-alpine/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/2022.05-dev/fpm/Dockerfile b/2022.05-dev/fpm/Dockerfile
index 2550d35..8a6917e 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/2022.05-dev/fpm/entrypoint.sh b/2022.05-dev/fpm/entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/2022.05-dev/fpm/entrypoint.sh
+++ b/2022.05-dev/fpm/entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }
 
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 56617b9..f7fbc2d 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 c68cd37..8e32e3b 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; \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 0739dd4..3d324f2 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,11 +3,10 @@ set -eu
 
 # run an command with the www-data user
 run_as() {
-  set -- -c "cd /var/www/html; $*"
   if [ "$(id -u)" -eq 0 ]; then
-    su - www-data -s /bin/sh "$@"
+    su -p www-data -s /bin/sh -c "$1"
   else
-    sh "$@"
+    sh -c "$1"
   fi
 }