diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index acfdf6ff..bfcc499d 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -122,9 +122,8 @@ RUN set -ex; \
     apk del --no-network .fetch-deps
 
 # Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-COPY helpers.php /etc/phpmyadmin/helpers.php
-RUN chown www-data:www-data -R /etc/phpmyadmin/
+COPY --chown=www-data:www-data config.inc.php /etc/phpmyadmin/config.inc.php
+COPY --chown=www-data:www-data helpers.php /etc/phpmyadmin/helpers.php
 
 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index baa06302..15f1578a 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -142,9 +142,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-COPY helpers.php /etc/phpmyadmin/helpers.php
-RUN chown www-data:www-data -R /etc/phpmyadmin/
+COPY --chown=www-data:www-data config.inc.php /etc/phpmyadmin/config.inc.php
+COPY --chown=www-data:www-data helpers.php /etc/phpmyadmin/helpers.php
 
 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/apache/Dockerfile b/apache/Dockerfile
index a06e5788..dff20054 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -143,9 +143,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-COPY helpers.php /etc/phpmyadmin/helpers.php
-RUN chown www-data:www-data -R /etc/phpmyadmin/
+COPY --chown=www-data:www-data config.inc.php /etc/phpmyadmin/config.inc.php
+COPY --chown=www-data:www-data helpers.php /etc/phpmyadmin/helpers.php
 
 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index b00adb29..eefb7331 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -123,9 +123,8 @@ RUN set -ex; \
     apk del --no-network .fetch-deps
 
 # Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-COPY helpers.php /etc/phpmyadmin/helpers.php
-RUN chown www-data:www-data -R /etc/phpmyadmin/
+COPY --chown=www-data:www-data config.inc.php /etc/phpmyadmin/config.inc.php
+COPY --chown=www-data:www-data helpers.php /etc/phpmyadmin/helpers.php
 
 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index ef5531ac..f9fe9e1b 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -140,9 +140,8 @@ RUN set -ex; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-COPY helpers.php /etc/phpmyadmin/helpers.php
-RUN chown www-data:www-data -R /etc/phpmyadmin/
+COPY --chown=www-data:www-data config.inc.php /etc/phpmyadmin/config.inc.php
+COPY --chown=www-data:www-data helpers.php /etc/phpmyadmin/helpers.php
 
 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh