diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml
index ebf3bbd..a5c2dfd 100644
--- a/customers/base/nextcloud-configmap.yml
+++ b/customers/base/nextcloud-configmap.yml
@@ -20,8 +20,6 @@ data:
         RemoteIPInternalProxy 37.156.195.22
         # TODO: Package 404 for k8s
         # ErrorDocument 404 /404.html
-        ErrorLog /tmp/error.log
-        TransferLog /tmp/error.log
         <Directory /var/www/html/>
             LimitRequestBody 0
             Require all granted
@@ -33,6 +31,47 @@ data:
             </IfModule>
         </Directory>
     </VirtualHost>
+  apache2.conf: |
+    DefaultRuntimeDir ${APACHE_RUN_DIR}
+    PidFile ${APACHE_PID_FILE}
+    Timeout 300
+    KeepAlive On
+    MaxKeepAliveRequests 100
+    KeepAliveTimeout 5
+    User ${APACHE_RUN_USER}
+    Group ${APACHE_RUN_GROUP}
+    HostnameLookups Off
+    ErrorLog /dev/stderr
+    TransferLog /dev/stdout
+    LogLevel debug
+    IncludeOptional mods-enabled/*.load
+    IncludeOptional mods-enabled/*.conf
+    Include ports.conf
+    <Directory />
+      Options FollowSymLinks
+      AllowOverride None
+      Require all denied
+    </Directory>
+    <Directory /usr/share>
+      AllowOverride None
+      Require all granted
+    </Directory>
+    <Directory /var/www/>
+      Options Indexes FollowSymLinks
+      AllowOverride None
+      Require all granted
+    </Directory>
+    AccessFileName .htaccess
+    <FilesMatch "^\.ht">
+      Require all denied
+    </FilesMatch>
+    LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+    LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %O" common
+    LogFormat "%{Referer}i -> %U" referer
+    LogFormat "%{User-agent}i" agent
+    IncludeOptional conf-enabled/*.conf
+    IncludeOptional sites-enabled/*.conf
   config.php: |
     <?php
     $CONFIG = array (
diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml
index 056d0b7..5a9b6de 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -41,9 +41,12 @@ spec:
             - name: nextcloud-data
               mountPath: /var/www/html/config
               subPath: config
-            - name: apache-config
+            - name: default-config
               mountPath: /etc/apache2/sites-enabled/000-default.conf
               subPath: 000-default.conf
+            - name: apache2-config
+              mountPath: /etc/apache2/apache2.conf
+              subPath: ports.conf
             - name: ports-config
               mountPath: /etc/apache2/ports.conf
               subPath: ports.conf
@@ -180,7 +183,13 @@ spec:
             items:
               - key: "config.php"
                 path: "config.php"
-        - name: apache-config
+        - name: apache2-config
+          configMap:
+            name: nextcloud-configmap
+            items:
+              - key: "apache2.conf"
+                path: "apache2.conf"
+        - name: default-config
           configMap:
             name: nextcloud-configmap
             items: