diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index 88d147212..bc4944b3a 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/11.0/fpm-alpine/Dockerfile b/11.0/fpm-alpine/Dockerfile
index 0e352c410..160420d46 100644
--- a/11.0/fpm-alpine/Dockerfile
+++ b/11.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index f176960be..8f7ebc123 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 28a9dde28..1f6413ae8 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
index 57ac1bc7c..e8daeb533 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 4202bf00b..e507e9c50 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index b2a965f90..c8454c7e6 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index e2c9a8d62..eb87ea02d 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 0e4b650a6..8f623cddb 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index b1a0f96b8..41e608b99 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 %%VARIANT_EXTRAS%%
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index a5db872ac..5b73a108b 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 %%VARIANT_EXTRAS%%