diff --git a/roles/mgrote_munin_server/templates/apache.conf b/roles/mgrote_munin_server/templates/apache.conf
index d4890a19..baded428 100644
--- a/roles/mgrote_munin_server/templates/apache.conf
+++ b/roles/mgrote_munin_server/templates/apache.conf
@@ -1,19 +1,20 @@
 <VirtualHost *:80>
     ServerName {{ munin_servername }}
 
-    # Redirect requests without /munin to /munin
-    RedirectMatch ^/$ /munin/
+    ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
+    ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
 
-    # Existing configuration for serving /munin
     <Directory /etc/munin/static>
         Require all granted
-        Options None
     </Directory>
 
-    <Location /munin-cgi/munin-cgi-graph>
+    <Directory /usr/lib/munin/cgi>
         Require all granted
         <IfModule mod_fcgid.c>
             SetHandler fcgid-script
         </IfModule>
-    </Location>
+        <IfModule !mod_fcgid.c>
+            SetHandler cgi-script
+        </IfModule>
+    </Directory>
 </VirtualHost>