diff --git a/Containerfile.fpm b/Containerfile.fpm
index 8116b0d..80310e5 100644
--- a/Containerfile.fpm
+++ b/Containerfile.fpm
@@ -34,9 +34,9 @@ RUN set -xe;\
   git apply /patches/0004-disable-beagle-service.patch &&\
   git apply /patches/0005-allow-30-char-usernames.patch &&\
   composer install --prefer-dist --no-interaction --no-ansi --no-dev --optimize-autoloader &&\
-  ln -s public html &&\
   chown -R www-data:www-data /var/www &&\
   cp -r storage storage.skel &&\
+  cp -r public public.skel &&\
   rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore
 
 FROM docker.io/php:8.1-fpm-bullseye
@@ -66,7 +66,7 @@ RUN set -xe;\
   sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\
   mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 WORKDIR /var/www
-VOLUME /var/www/storage /var/www/bootstrap /public
+VOLUME /var/www/storage /var/www/bootstrap /var/www/public
 ENTRYPOINT /entrypoint.sh
 
 LABEL build.date=$DATE version.pixelfev=$VERSION
diff --git a/entrypoint.fpm.sh b/entrypoint.fpm.sh
index 8bcdfff..8760b79 100755
--- a/entrypoint.fpm.sh
+++ b/entrypoint.fpm.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 set -xeo pipefail
 
-cp -r storage.skel/* storage/
+rsync -a --delete storage.skel/* storage/
+rsync -a --delete public.skel/ public/
 chown -R www-data:www-data storage/ bootstrap/
 
 php /wait-for-db.php