diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile
index 7343a3c3..6c815c8b 100644
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@@ -22,9 +22,6 @@
     # Others
     import /mnt/data/caddy-imports/*
 
-    # Nextcloud
-    import /mnt/data/nextcloud
-
     # TLS options
     tls {
         issuer acme {
diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
index f1443d09..f9cea6f1 100644
--- a/Containers/apache/Dockerfile
+++ b/Containers/apache/Dockerfile
@@ -5,7 +5,7 @@ FROM httpd:2.4.57-alpine3.17
 
 COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
 
-COPY --chown=www-data:www-data Caddyfile /Caddyfile
+COPY --chown=33:33 Caddyfile /Caddyfile
 COPY --chmod=664 nextcloud.conf /usr/local/apache2/conf/nextcloud.conf
 COPY --chmod=664 nextcloud /nextcloud
 COPY --chmod=664 caddy-imports/* /caddy-imports/
diff --git a/Containers/apache/nextcloud b/Containers/apache/nextcloud
index 16a7a088..a0c2c80a 100644
--- a/Containers/apache/nextcloud
+++ b/Containers/apache/nextcloud
@@ -1,5 +1,5 @@
 # Nextcloud
-route {
+route /* {
     rewrite /.well-known/carddav /remote.php/dav
     rewrite /.well-known/caldav /remote.php/dav
     header Strict-Transport-Security max-age=31536000;
diff --git a/Containers/apache/start.sh b/Containers/apache/start.sh
index 6229f025..2aefe251 100644
--- a/Containers/apache/start.sh
+++ b/Containers/apache/start.sh
@@ -46,7 +46,7 @@ fi
 echo "$CADDYFILE" > /Caddyfile
 
 # Overwrite nextcloud conf
-cat /nextcloud > /mnt/data/nextcloud
+cat /nextcloud > /mnt/data/caddy-imports/nextcloud
 
 # Fix the Caddyfile format
 caddy fmt --overwrite /Caddyfile