diff --git a/conf.d/fluid-eos-test.conf b/conf.d/fluid-eos-test.conf
new file mode 100644
index 0000000..6826f64
--- /dev/null
+++ b/conf.d/fluid-eos-test.conf
@@ -0,0 +1,30 @@
+# INC0150202 Kohlbrecher Joachim & Wall Edward Owen
+server {
+    listen 80;
+    server_name fluid-eos-test.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name fluid-eos-test.psi.ch;
+
+    root /opt/webcontent/fluid-eos;
+    index index.html;
+
+    ssl_certificate     /etc/nginx/certs/fluid-eos-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/fluid-eos-test.psi.ch.key;
+
+    access_log /var/log/nginx/fluid-eos-test.access.log;
+    error_log  /var/log/nginx/fluid-eos-test.error.log;
+
+    location / {
+        autoindex on;
+        autoindex_exact_size off;
+        autoindex_localtime on;
+
+        try_files $uri $uri/ =404;
+    }
+}
+
diff --git a/conf.d/rfmwtools-test.conf b/conf.d/rfmwtools-test.conf
new file mode 100644
index 0000000..6a59873
--- /dev/null
+++ b/conf.d/rfmwtools-test.conf
@@ -0,0 +1,30 @@
+# Gaspar Marcos - ISPD Migration
+server {
+    listen 80;
+    server_name rfmwtools-test.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name rfmwtools-test.psi.ch;
+
+    root /opt/webcontent/rfmwtools;
+    index rfmwtools.html;
+
+    ssl_certificate     /etc/nginx/certs/rfmwtools-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/rfmwtools-test.psi.ch.key;
+
+    access_log /var/log/nginx/rfmwtools-test.access.log;
+    error_log  /var/log/nginx/rfmwtools-test.error.log;
+
+    location / {
+        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 b87386f..e2a26b0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,6 +18,8 @@ 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/rfmwtools:/opt/webcontent/rfmwtools:ro
       - /opt/webcontent/it-strategy-dashboard/frontend/:/opt/webcontent/it-strategy-dashboard/:ro
     networks:
       - public