diff --git a/apache/conf/fluid-eos.conf b/apache/conf/fluid-eos.conf
new file mode 100644
index 0000000..7c8139d
--- /dev/null
+++ b/apache/conf/fluid-eos.conf
@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    ServerName fluid-eos-test.psi.ch
+    DocumentRoot /var/www/html/fluid-eos
+
+    # Allow CGI everywhere if needed
+    Options +ExecCGI
+    AddHandler cgi-script .pl .cgi .x
+
+    <Directory "/var/www/html/fluid-eos">
+        Options +ExecCGI
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    # Explicit CGI directories
+    ScriptAlias /cgi-bin/ /var/www/html/fluid-eos/cgi-bin/
+    <Directory "/var/www/html/fluid-eos/cgi-bin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+
+    ScriptAlias /cgibin/ /var/www/html/fluid-eos/cgibin/
+    <Directory "/var/www/html/fluid-eos/cgibin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+</VirtualHost>
+
diff --git a/conf.d/fluid-eos-test.conf b/conf.d/fluid-eos-test.conf
index e0e1a21..4c14d97 100644
--- a/conf.d/fluid-eos-test.conf
+++ b/conf.d/fluid-eos-test.conf
@@ -24,14 +24,6 @@ server {
         autoindex_exact_size off;
         autoindex_localtime on;
 
-        try_files $uri $uri/ =404;
-    }
-    location ^~ /EOS/ {
-	autoindex on;
-        autoindex_exact_size off;
-        autoindex_localtime on;
-
-	try_files $uri $uri/ =404;
     }
 }
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ec29500..c73d473 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,7 +18,6 @@ services:
       - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - /etc/nginx/conf.d:/etc/nginx/conf.d:ro
       - /opt/webcontent/sinqstatus-test:/opt/webcontent/sinqstatus-test:ro
-      - /opt/webcontent/fluid-eos:/opt/webcontent/fluid-eos:ro
       - /opt/webcontent/it-strategy-dashboard/frontend/:/opt/webcontent/it-strategy-dashboard/:ro
     networks:
       - public
@@ -33,8 +32,10 @@ services:
     volumes:
       - /opt/webcontent/rfmwtools:/var/www/rfmwtools:ro
       - /opt/webcontent/gfa-status:/var/www/gfa-status:ro
+      - /opt/webcontent/fluid-eos:/var/www/fluid-eos:ro
       - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro
       - ./apache/conf/gfa-status.conf:/etc/apache2/sites-enabled/gfa-status.conf:ro
+      - ./apache/conf/fluid-eos.conf:/etc/apache2/sites-enabled/fluid-eos.conf:ro
     networks:
       - backend