diff --git a/3.0/apache/Dockerfile b/3.0/apache/Dockerfile
index e4bf2c1..37e85e0 100644
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -2,6 +2,8 @@ FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
 ARG version='3.26.1+210427'
 ARG sha256_checksum='25ed4c956e4b839db05178d7a38f508799a5ea2556b540fec04aeb750817b900'
+ARG USER=root
+ARG LISTEN_PORT=80
 
 # Install OS dependencies
 RUN set -ex; \
@@ -71,9 +73,10 @@ RUN set -ex; \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2
 
 WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/4.0/apache/Dockerfile b/4.0/apache/Dockerfile
index 54fd4e1..3085eb6 100644
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -2,6 +2,8 @@ FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
 ARG version='4.5.2+210426'
 ARG sha256_checksum='001c3e416e319d1b64e502620fa2a9a32e69d9b4db2f6376f4a6293b43a063ea'
+ARG USER=root
+ARG LISTEN_PORT=80
 
 # Install OS dependencies
 RUN set -ex; \
@@ -72,9 +74,10 @@ RUN set -ex; \
         \
         tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
         rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2
 
 WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/makefile b/makefile
index 5f34a3e..341efe1 100644
--- a/makefile
+++ b/makefile
@@ -2,8 +2,12 @@
 
 apache3:
 	docker build --pull -t martialblog/limesurvey:3-apache 3.0/apache
+apache3-rootless:
+	docker build --pull --build-arg USER=www-data --build-arg LISTEN_PORT=8080 -t martialblog/limesurvey:3-apache-rootless 3.0/apache
 apache4:
-	docker build --pull -t martialblog/limesurvey:4-apache 4.0/apache
+	docker build --pull -t martialblog/limesurvey:3-apache 3.0/apache
+apache4-rootless:
+	docker build --pull --build-arg USER=www-data --build-arg LISTEN_PORT=8080 -t martialblog/limesurvey:4-apache-rootless 4.0/apache
 fpm-alpine3:
 	docker build --pull -t martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
 fpm-alpine4: