diff --git a/conf.d/saparchive.conf b/conf.d/saparchive.conf
new file mode 100644
index 0000000..09e2338
--- /dev/null
+++ b/conf.d/saparchive.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name saparchive.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name saparchive.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/saparchive.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/saparchive.psi.ch.key;
+
+    location / {
+        proxy_pass http://tiacore-prod:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5677f89..6c701b9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -285,16 +285,34 @@ services:
       - backend
       - panda_maintenance_backend
 
-  tiacore:
+  # michael.schmidt@psi.ch
+  # SAP Archiv Programm von der Firma KGS supportabteilung@kgs-software.com
+  tiacore-test:
     container_name: tiacore-test
     image: images.kgs-cloud.de/tia/core/saphttp:3.17.1
     volumes:
       - /opt/webcontent/tiacore-test/config/license:/application/license
       - /opt/webcontent/tiacore-test/config/keystore:/application/ssl
       - /opt/webcontent/tiacore-test/config:/application/config/
-      - /mount/saparchive:/application/data_classic
-      - /opt/webcontent/tiacore-data/core_archive:/application/data_core
-      # - /opt/kgs/docker/certificates:/application/ssl
+      - /mount/saparchive/testdata:/application/data
+    environment:
+      LOGGING_LEVEL_ROOT: INFO
+      # Authentifizierung für WebUI
+      WEBAPP_SECURITY_AUTH_BASIC_USERNAME: admin
+      WEBAPP_SECURITY_AUTH_BASIC_PASSWORD: "$$2a$$10$$5E1KpGIKSq6xuWmGf92bheB17V0l4fEMnVmYPqhWiazKddcx1TF/e"
+    networks:
+      - backend
+
+  # michael.schmidt@psi.ch
+  # SAP Archiv Programm von der Firma KGS supportabteilung@kgs-software.com
+  tiacore-prod:
+    container_name: tiacore-prod
+    image: images.kgs-cloud.de/tia/core/saphttp:3.17.1
+    volumes:
+      - /opt/webcontent/tiacore-prod/config/license:/application/license
+      - /opt/webcontent/tiacore-prod/config/keystore:/application/ssl
+      - /opt/webcontent/tiacore-prod/config:/application/config/
+      - /mount/saparchive:/application/data
     environment:
       LOGGING_LEVEL_ROOT: INFO
       # Authentifizierung für WebUI