diff --git a/aap/Dockerfile b/aap/Dockerfile
index 472dcba..f57211f 100644
--- a/aap/Dockerfile
+++ b/aap/Dockerfile
@@ -41,6 +41,7 @@ RUN chown -R apache:apache /var/www/localhost\
     && sed -i 's+apache:x:100:101:apache:/var/www:/sbin/nologin+apache:x:100:101:apache:/var/www/localhost:/sbin/nologin+' /etc/passwd
 
 USER apache
+ENV SERVERADMINMAIL=webmaster@example.com
 
 VOLUME /var/www/localhost
 EXPOSE 8080
diff --git a/webdav/Dockerfile b/webdav/Dockerfile
index bbfe907..123df42 100644
--- a/webdav/Dockerfile
+++ b/webdav/Dockerfile
@@ -27,6 +27,7 @@ USER apache
 VOLUME /var/www
 WORKDIR /var/www
 EXPOSE 8080
+ENV SERVERADMINMAIL=webmaster@example.com
 CMD httpd -D FOREGROUND
 
 
diff --git a/webdav/assets/httpd.conf b/webdav/assets/httpd.conf
index 5cee527..2e803c5 100644
--- a/webdav/assets/httpd.conf
+++ b/webdav/assets/httpd.conf
@@ -206,7 +206,7 @@ DavLockDB /var/www/dav.lockdb
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin ${ADMINMAILADDRESS}
+ServerAdmin ${SERVERADMINMAIL}
 
 #
 # Optionally add a line containing the server version and virtual host