diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile
index 01222f5c..a73c7961 100644
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@@ -44,7 +44,7 @@
         rewrite /.well-known/carddav /remote.php/dav
         rewrite /.well-known/caldav /remote.php/dav
         header Strict-Transport-Security max-age=31536000;
-        reverse_proxy localhost:80
+        reverse_proxy localhost:8000
     }
 
     # TLS options
diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
index 02217851..192d5396 100644
--- a/Containers/apache/Dockerfile
+++ b/Containers/apache/Dockerfile
@@ -40,6 +40,10 @@ RUN a2enmod rewrite \
 
 COPY nextcloud.conf /etc/apache2/sites-available/
 
+RUN rm /etc/apache2/ports.conf; \
+    sed -s -i -e "s/Include ports.conf//" /etc/apache2/apache2.conf; \
+    sed -i "/^Listen /d" /etc/apache2/apache2.conf
+
 RUN set -ex; \
     a2dissite 000-default && \
     a2dissite default-ssl && \
diff --git a/Containers/apache/nextcloud.conf b/Containers/apache/nextcloud.conf
index f30a70fd..f7c720f6 100644
--- a/Containers/apache/nextcloud.conf
+++ b/Containers/apache/nextcloud.conf
@@ -1,4 +1,5 @@
-<VirtualHost *:80>
+Listen 8000
+<VirtualHost *:8000>
     # PHP match
     <FilesMatch "\.php$">
         SetHandler "proxy:fcgi://nextcloud-aio-nextcloud:9000"