diff --git a/apache/conf/rfmwtools.conf b/apache/conf/rfmwtools.conf
index 5122cda..e86abfd 100644
--- a/apache/conf/rfmwtools.conf
+++ b/apache/conf/rfmwtools.conf
@@ -1,19 +1,26 @@
 <VirtualHost *:80>
     ServerName rfmwtools-test.psi.ch
 
+    # Document root for static files
     DocumentRoot /var/www/rfmwtools
 
+    # CGI scripts
     ScriptAlias /cgi-bin/ /var/www/rfmwtools/cgi-bin/
 
     <Directory "/var/www/rfmwtools/cgi-bin">
         Options +ExecCGI +FollowSymLinks +Indexes
         AddHandler cgi-script .sh .cgi
         Require all granted
+
+        SetEnv SCRIPT_WORKDIR /var/www/rfmwtools/cgi-bin
+        DirectoryIndex rfmwtools.html
     </Directory>
 
     <Directory "/var/www/rfmwtools">
         Options Indexes FollowSymLinks
+        AllowOverride None
         Require all granted
+        DirectoryIndex rfmwtools.html
     </Directory>
 
     ErrorLog /proc/self/fd/2