diff --git a/conf.d/rf-pikett.conf b/conf.d/rf-pikett.conf
new file mode 100644
index 0000000..08ae66f
--- /dev/null
+++ b/conf.d/rf-pikett.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name rf-pikett.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name rf-pikett.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/rf-pikett.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/rf-pikett.psi.ch.key;
+
+    location / {
+        proxy_pass http://pikettlischte-beautifier:80;
+        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 26bcbdc..b5623e8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -573,6 +573,16 @@ services:
     volumes:
       - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw
 
+  # Aimo Altorfer / Roger Kalt - RF
+  # rf-pikett.psi.ch - Pikettlischte Beautifier
+  # Image is built from https://gitea.psi.ch/RF/pikettlischte-beautifier
+  pikettlischte-beautifier:
+    image: gitea.psi.ch/rf/pikettlischte-beautifier:latest
+    container_name: pikettlischte-beautifier
+    restart: always
+    networks:
+      - backend
+
 networks:
   public:
   backend: