diff --git a/apache/conf/rfmwtools.conf b/apache/conf/rfmwtools.conf
index 941665e..0967497 100644
--- a/apache/conf/rfmwtools.conf
+++ b/apache/conf/rfmwtools.conf
@@ -3,10 +3,17 @@
 
     DocumentRoot /var/www/rfmwtools
 
+    # Serve HTML and static files at root
+    <Directory "/var/www/rfmwtools">
+        Options +FollowSymLinks
+        DirectoryIndex rfmwtools.html
+        Require all granted
+    </Directory>
+
+    # Enable CGI execution for scripts in cgi-bin
     <Directory "/var/www/rfmwtools/cgi-bin">
-        Options +ExecCGI +FollowSymLinks +Indexes
+        Options +ExecCGI +FollowSymLinks
         AddHandler cgi-script .sh .cgi
-	DirectoryIndex rfmwtools.html
         Require all granted
     </Directory>