diff --git a/roles/mgrote_munin_server/templates/apache.conf b/roles/mgrote_munin_server/templates/apache.conf
index b0b5dada..732bdc14 100644
--- a/roles/mgrote_munin_server/templates/apache.conf
+++ b/roles/mgrote_munin_server/templates/apache.conf
@@ -2,23 +2,20 @@
     ServerName {{ munin_servername }}
 
     # Redirect requests without /munin to /munin
-    RedirectMatch ^/$ /munin-cgi/
+    RedirectMatch ^/$ /munin/
 
     # Existing configuration for serving /munin
     Alias /munin /var/cache/munin/www
     <Directory /var/cache/munin/www>
-            Require all granted
-            Options None
+        Require all granted
+        Options None
     </Directory>
 
     ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
     <Location /munin-cgi/munin-cgi-graph>
-            Require all granted
-            <IfModule mod_fcgid.c>
-                SetHandler fcgid-script
-            </IfModule>
-            <IfModule !mod_fcgid.c>
-                SetHandler cgi-script
-            </IfModule>
+        Require all granted
+        <IfModule mod_fcgid.c>
+            SetHandler fcgid-script
+        </IfModule>
     </Location>
 </VirtualHost>