diff --git a/Dockerfile b/Dockerfile
index b594583..eb7243a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -101,8 +101,6 @@ RUN tar xzf release.tar.gz -C /var/lib/nextcloud/apps/sociallogin --strip 1
 
 FROM thallian/php8-fpm:latest
 
-COPY --from=builder /var/lib/nextcloud /var/lib/nextcloud
-
 ENV FPMUSER=nginx
 ENV FPMGROUP=nginx
 ENV PHP_MEMORY_LIMIT=512M
@@ -138,7 +136,8 @@ RUN apk add --no-cache  \
     php8-bcmath \
     php8-gmp
 
-RUN chown -R nginx:nginx /var/lib/nextcloud
+COPY --from=builder --chown=nginx:nginx /var/lib/nextcloud /var/lib/nextcloud
+
 RUN rm /etc/nginx/http.d/default.conf
 
 ADD /rootfs /
diff --git a/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir b/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir
index f545e9c..7e2a8a2 100644
--- a/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir
+++ b/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir
@@ -1,2 +1,2 @@
-/var/lib/nextcloud/ true nginx 0640 0750
+/var/lib/nextcloud/data true nginx 0640 0750
 /var/lib/nextcloud/config true nginx 0640 0750