diff --git a/chart/charts/httpd/templates/authenticating-proxy-deployment.yaml b/chart/charts/httpd/templates/authenticating-proxy-deployment.yaml
index 70b5019017c83376e2247a61e22322e1b1a4d40c..279ad646494b6a30250c0f526211942d879ad80f 100644
--- a/chart/charts/httpd/templates/authenticating-proxy-deployment.yaml
+++ b/chart/charts/httpd/templates/authenticating-proxy-deployment.yaml
@@ -83,8 +83,6 @@ spec:
             mountPath: /var/www/html/pages-user-instructions
           - name: httpd-pid
             mountPath: /var/httpd
-          - name: vhost-config
-            mountPath: /etc/httpd/conf.d/vhost
           {{- range until $count }}
           - name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
             mountPath: /etc/httpd/conf.d/vhost.{{.}}.d
@@ -101,7 +99,7 @@ spec:
             # reload configuration if a change in configuration directories has been detected
             # /vhost.COUNT.d is where the vhosts-secret is mounted
             # /etc/httpd/ssl is for renewal of the wildcard certificate for *.pages(-dev).cern.ch
-            inotifywait -m -r -e create -e modify -e delete --format '%w%f' /vhosts-config /etc/httpd/ssl |
+            inotifywait -m -r -e create -e modify -e delete --format '%w%f' /vhost.*.d /etc/httpd/ssl |
               while read dir action file;
               do
                 httpd_pid=`cat /var/httpd/httpd.pid`
@@ -114,8 +112,6 @@ spec:
             requests:
               memory: 50Mi
           volumeMounts:
-          - name: vhost-config
-            mountPath: /vhosts-config
           {{- range until $count }}
           - name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
             mountPath: /vhost.{{.}}.d
@@ -131,9 +127,6 @@ spec:
           name: httpd-config
       - name: httpd-pid
         emptyDir: {}
-      - name: vhost-config
-        secret:
-          secretName: vhosts-config
       {{- range until $count }}
       - name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
         secret:
diff --git a/chart/charts/httpd/templates/httpd-configmap.yaml b/chart/charts/httpd/templates/httpd-configmap.yaml
index 15ea9ef94f4d636619a13d2d03fca8ad817362f2..093e30e3fefcaad9f91e2038201fc53d91b00bf7 100644
--- a/chart/charts/httpd/templates/httpd-configmap.yaml
+++ b/chart/charts/httpd/templates/httpd-configmap.yaml
@@ -36,7 +36,7 @@ data:
     </VirtualHost>
 
     # configuration files generated by the gitlab-pages-site-operator
-    IncludeOptional conf.d/vhost/*.conf
+    IncludeOptional conf.d/vhost.*.d/*.conf
 
     # configuration file for handling the pages wildcard *.pages(-dev).cern.ch
     IncludeOptional conf.d/pages-wildcard.conf