diff --git a/base/Dockerfile b/base/Dockerfile
index d1ded14853f9dc4001a6e604347552bbcaa018bd..37d2526ae34c54adbf801632a3a99367b03c7d29 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION
 RUN ./install.sh
 RUN rm ./install.sh ./install-list
 
-FROM libresh/nextcloud:${VERSION}-upstream
+FROM nextcloud:${VERSION}-fpm-alpine
 RUN set -ex; \
     \
     apk add --no-cache \
@@ -24,16 +24,15 @@ RUN set -ex; \
     docker-php-ext-install imap; \
     apk del .build-deps
 COPY redis.ini /usr/local/etc/php/conf.d/
-COPY --chown=www-data:root config/* /var/www/html/config/
-COPY --from=apps --chown=www-data:root /apps/* /var/www/html/apps/
-RUN for app in $(cat /var/www/html/apps/remove-list);do \
+COPY --chown=www-data:root config/* /usr/src/nextcloud/config/
+COPY --from=apps --chown=www-data:root /apps/* /usr/src/nextcloud/apps/
+RUN for app in $(cat /usr/src/nextcloud/apps/remove-list);do \
       echo "removing app $app"; \
-      rm -R /var/www/html/apps/$app; \
+      rm -R /usr/src/nextcloud/apps/$app; \
     done; \
-    rm /var/www/html/apps/remove-list; \
+    rm /usr/src/nextcloud/apps/remove-list; \
     rm -rf custom_apps/; \
-    rm config/autoconfig.php config/config.sample.php; \
-    rm config/config.php
+    rm /usr/src/nextcloud/config/autoconfig.php /usr/src/nextcloud/config/config.sample.php;
 COPY install.sh /install.sh
 USER www-data
 ENTRYPOINT [""]
diff --git a/upstream b/upstream
deleted file mode 160000
index c9fca6fe7bbbe7466ed6a56fe544163fac78428a..0000000000000000000000000000000000000000
--- a/upstream
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9fca6fe7bbbe7466ed6a56fe544163fac78428a
diff --git a/web/Dockerfile b/web/Dockerfile
index 795f8d5a6fe8c43f337d4208914afb21019d3f40..0d510fee8463ce79742110a65d459966493ca3e4 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,6 +1,6 @@
 ARG VERSION
 FROM libresh/nextcloud:${VERSION} as builder
-FROM nginx 
-COPY --from=builder /var/www/html /var/www/html 
+FROM nginx:alpine
+COPY --from=builder /usr/src/nextcloud /usr/src/nextcloud
 COPY nginx.conf /etc/nginx/nginx.conf
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/web/nginx.conf b/web/nginx.conf
index 6ea3933991b18a0655072b10493e637926a0b049..d95cff44cc6b12f9fa78849993a984dae6c3dfc3 100644
--- a/web/nginx.conf
+++ b/web/nginx.conf
@@ -26,7 +26,7 @@ http {
     add_header X-Permitted-Cross-Domain-Policies none;
     add_header Referrer-Policy no-referrer;
 
-    root /var/www/html;
+    root /usr/src/nextcloud;
 
     location = /robots.txt {
       allow all;